aboutsummaryrefslogtreecommitdiff
path: root/mod/src/main/java/kr
diff options
context:
space:
mode:
authorWalker Selby <git@walkerselby.com>2023-01-22 22:34:23 -0800
committerWalker Selby <git@walkerselby.com>2023-01-22 22:34:23 -0800
commitb584f3a89b88cb28094e30cc380353786220623e (patch)
treef24acdca29c334e0399117839d5de98322734a74 /mod/src/main/java/kr
parent2c3e379ae8417b89ddccb9bfcb4162373d18e08d (diff)
downloadSkyblock-Dungeons-Guide-b584f3a89b88cb28094e30cc380353786220623e.tar.gz
Skyblock-Dungeons-Guide-b584f3a89b88cb28094e30cc380353786220623e.tar.bz2
Skyblock-Dungeons-Guide-b584f3a89b88cb28094e30cc380353786220623e.zip
Fix typos, grammar, and article agreement
Adjust variable/function capitalization to match camelCase Refactor some things for typos
Diffstat (limited to 'mod/src/main/java/kr')
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/commands/CommandDgDebug.java2
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/config/guiconfig/MFeature.java2
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/config/guiconfig/RootConfigPanel.java4
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/map/DungeonRoomScaffoldParser.java4
-rwxr-xr-xmod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/map/MapPlayerProcessor.java14
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/pathfinding/ThetaStar.java4
-rwxr-xr-xmod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomedit/panes/ActionTreeDisplayPane.java10
-rwxr-xr-xmod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomedit/panes/GeneralEditPane.java10
-rwxr-xr-xmod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomedit/valueedit/ValueEditAColor.java4
-rwxr-xr-xmod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomedit/valueedit/ValueEditColor.java4
-rwxr-xr-xmod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomfinder/DungeonRoom.java13
-rwxr-xr-xmod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomfinder/DungeonRoomInfoRegistry.java6
-rwxr-xr-xmod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomfinder/RoomMatcher.java6
-rwxr-xr-xmod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomprocessor/GeneralRoomProcessor.java6
-rwxr-xr-xmod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomprocessor/RoomProcessorBlazeSolver.java16
-rwxr-xr-xmod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomprocessor/RoomProcessorIcePath.java6
-rwxr-xr-xmod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomprocessor/RoomProcessorRiddle.java4
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomprocessor/bombdefuse/RoomProcessorBombDefuseSolver.java8
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomprocessor/bombdefuse/chambers/BDChamber.java2
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomprocessor/bombdefuse/chambers/ChamberProcessor.java2
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomprocessor/bombdefuse/chambers/GeneralDefuseChamberProcessor.java2
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomprocessor/bombdefuse/chambers/arrow/ArrowLeftProcessor.java2
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomprocessor/bombdefuse/chambers/arrow/ArrowRightProcessor.java2
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomprocessor/bombdefuse/chambers/color/ColorLeftProcessor.java2
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomprocessor/bombdefuse/chambers/color/ColorRightProcessor.java2
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomprocessor/bombdefuse/chambers/creeper/CreeperLeftProcessor.java2
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomprocessor/bombdefuse/chambers/creeper/CreeperRightProcessor.java2
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomprocessor/bombdefuse/chambers/maze/MazeRightProcessor.java2
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomprocessor/bombdefuse/chambers/number/NumberLeftProcessor.java2
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomprocessor/bombdefuse/chambers/number/NumberRightProcessor.java2
-rwxr-xr-xmod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomprocessor/boxpuzzle/RoomProcessorBoxSolver.java36
-rwxr-xr-xmod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomprocessor/waterpuzzle/WaterBoard.java60
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/events/annotations/EventHandlerRegistry.java6
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/events/impl/BlockUpdateEvent.java4
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/events/listener/PacketInjector.java31
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/FeatureRegistry.java2
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/advanced/FeatureDebugTrap.java4
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/advanced/FeatureTestPeople.java (renamed from mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/advanced/FeatureTestPepole.java)60
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/boss/FeatureCurrentPhase.java4
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/boss/FeatureHideAnimals.java2
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/boss/terminal/FeatureSimonSaysSolver.java26
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/boss/terminal/FeatureTerminalSolvers.java4
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/boss/terminal/SelectAllColorSolutionProvider.java (renamed from mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/boss/terminal/SelectAllColorSolutionProivider.java)2
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/dungeon/FeatureDungeonCurrentRoomSecrets.java6
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/dungeon/FeatureDungeonMap.java12
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/dungeon/FeatureDungeonSecrets.java7
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/etc/FeatureEpicCountdown.java12
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/etc/FeaturePenguins.java8
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/party/customgui/FeatureCustomPartyFinder.java10
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/party/customgui/PanelPartyFinder.java12
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/party/customgui/PanelPartyFinderSettings.java10
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/party/customgui/PanelPartyListElement.java28
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/party/playerpreview/FeatureViewPlayerStatsOnJoin.java8
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/party/playerpreview/api/ApiFetcher.java26
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/party/playerpreview/api/PlayerSkyblockData.java2
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/party/playerpreview/api/playerprofile/PlayerProfile.java2
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/party/playerpreview/api/playerprofile/PlayerProfileParser.java4
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/party/playerpreview/api/playerprofile/dataclasses/DungeonClass.java2
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/party/playerpreview/datarenders/DataRendererEditor.java22
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/party/playerpreview/datarenders/impl/DataRendererClassLv.java18
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/party/playerpreview/datarenders/impl/DataRendererSecrets.java4
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/party/playerpreview/datarenders/impl/DataRendererSelectedClassLv.java6
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/party/playerpreview/widget/WidgetPlayerModel.java26
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/party/playerpreview/widget/WidgetProfileViewerData.java8
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/solvers/FeatureSolverBlaze.java6
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/gui/MGui.java2
-rwxr-xr-xmod/src/main/java/kr/syeyoung/dungeonsguide/mod/gui/elements/MButton.java8
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/gui/elements/MCollapsable.java12
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/gui/elements/MList.java10
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/gui/elements/MPortableColorEdit.java4
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/gui/elements/MScrollablePanel.java30
-rwxr-xr-xmod/src/main/java/kr/syeyoung/dungeonsguide/mod/gui/elements/MTextField.java8
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/guiv2/GuiScreenAdapter.java2
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/guiv2/Widget.java2
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/guiv2/elements/AspectRatioFitter.java2
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/guiv2/elements/Border.java2
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/guiv2/elements/image/ImageTexture.java2
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/guiv2/elements/image/URLImage.java2
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/guiv2/elements/richtext/fonts/DefaultFontRenderer.java4
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/guiv2/xml/AnnotatedImportOnlyWidget.java2
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/guiv2/xml/AnnotatedWidget.java6
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/guiv2/xml/DelegatingWidget.java4
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/guiv2/xml/DomElementRegistry.java4
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/guiv2/xml/PropByPropParsedWidgetConverter.java4
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/guiv2/xml/data/ParserElement.java2
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/guiv2/xml/data/W3CBackedParserElement.java2
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/parallelUniverse/tab/TabList.java14
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/parallelUniverse/tab/TabListEntry.java6
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/party/PartyManager.java4
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/stomp/StompClient.java4
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/stomp/StompManager.java2
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/stomp/StompPayload.java2
-rwxr-xr-xmod/src/main/java/kr/syeyoung/dungeonsguide/mod/utils/RenderUtils.java4
-rwxr-xr-xmod/src/main/java/kr/syeyoung/dungeonsguide/mod/utils/TextUtils.java4
-rwxr-xr-xmod/src/main/java/kr/syeyoung/dungeonsguide/mod/utils/VectorUtils.java2
-rw-r--r--mod/src/main/java/kr/syeyoung/dungeonsguide/mod/utils/cursor/GLCursors.java10
96 files changed, 378 insertions, 415 deletions
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 b6b11c63..9b0c8af7 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
@@ -94,7 +94,7 @@ public class CommandDgDebug extends CommandBase {
}
}else if ("tablist".equals(arg)) {
for (TabListEntry entry : TabList.INSTANCE.getTabListEntries()) {
- ChatTransmitter.addToQueue(entry.getFormatted()+" "+entry.getEffectiveName()+"("+entry.getPing()+")" + entry.getGamemode());
+ ChatTransmitter.addToQueue(entry.getFormatted()+" "+entry.getEffectiveName()+"("+entry.getPing()+")" + entry.getGameMode());
}
ChatTransmitter.addToQueue("VS");
} else if ("mockdungeonstart".equals(arg)) {
diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/config/guiconfig/MFeature.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/config/guiconfig/MFeature.java
index aeddc558..d318afe2 100644
--- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/config/guiconfig/MFeature.java
+++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/config/guiconfig/MFeature.java
@@ -92,7 +92,7 @@ public class MFeature extends MPanel {
@Override
public void run() {
Minecraft.getMinecraft().displayGuiScreen(new GuiGuiLocationConfig(Minecraft.getMinecraft().currentScreen, abstractFeature));
- button.setIsclicked(false);
+ button.setClicked(false);
}
});
button.setBackground(RenderUtils.blendAlpha(0x141414, 0.07f));
diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/config/guiconfig/RootConfigPanel.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/config/guiconfig/RootConfigPanel.java
index 230bdf80..a9602bb9 100644
--- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/config/guiconfig/RootConfigPanel.java
+++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/config/guiconfig/RootConfigPanel.java
@@ -100,7 +100,7 @@ public class RootConfigPanel extends MPanelScaledGUI {
guiRelocate.setText("Edit Gui Locations");
guiRelocate.setOnActionPerformed(() -> {
Minecraft.getMinecraft().displayGuiScreen(new GuiGuiLocationConfig(gui, null));
- guiRelocate.setIsclicked(false);
+ guiRelocate.setClicked(false);
});
guiRelocate.setBorder(RenderUtils.blendTwoColors(0xFF141414,0x7702EE67));
add(guiRelocate);
@@ -297,7 +297,7 @@ public class RootConfigPanel extends MPanelScaledGUI {
navigation.setBounds(new Rectangle(new Point(0,1), new Dimension(Math.max(100, Math.max(navigation.getPreferredSize().width, navigationScroll.getBounds().width-10)), navigation.getPreferredSize().height)));
navigation.realignChildren();
- navigationScroll.evalulateContentArea();
+ navigationScroll.evaluateContentArea();
Rectangle navBound;
navigationScroll.setBounds(navBound = new Rectangle(0,50, navigation.getBounds().width+10, effectiveDim.height-50));
contentScroll.setBounds(new Rectangle(navBound.x + navBound.width, 25, effectiveDim.width - navBound.x - navBound.width, effectiveDim.height-25));
diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/map/DungeonRoomScaffoldParser.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/map/DungeonRoomScaffoldParser.java
index 9b32e541..6cd046cd 100644
--- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/map/DungeonRoomScaffoldParser.java
+++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/map/DungeonRoomScaffoldParser.java
@@ -35,8 +35,8 @@ import net.minecraft.world.storage.MapData;
import javax.vecmath.Vector2d;
import java.awt.*;
-import java.util.*;
import java.util.List;
+import java.util.*;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
@@ -149,7 +149,7 @@ public class DungeonRoomScaffoldParser {
private DungeonRoom buildRoom(byte[] mapData, Point unitPoint) {
java.util.Queue<Point[]> toCheck = new LinkedList<>();
- toCheck.add(new Point[]{unitPoint, unitPoint}); // requestor, target
+ toCheck.add(new Point[]{unitPoint, unitPoint}); // requester, target
Set<Point> checked = new HashSet<>();
Set<Point> ayConnected = new HashSet<>();
diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/map/MapPlayerProcessor.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/map/MapPlayerProcessor.java
index 29f39a08..c52d3693 100755
--- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/map/MapPlayerProcessor.java
+++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/map/MapPlayerProcessor.java
@@ -28,13 +28,15 @@ import net.minecraft.client.Minecraft;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemMap;
import net.minecraft.item.ItemStack;
-import net.minecraft.util.*;
+import net.minecraft.util.BlockPos;
+import net.minecraft.util.ChatComponentText;
+import net.minecraft.util.Vec4b;
import net.minecraft.world.storage.MapData;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import java.awt.*;
-import java.util.*;
+import java.util.Map;
public class MapPlayerProcessor {
@@ -47,7 +49,7 @@ public class MapPlayerProcessor {
* If the player on the map is closer than value this it won't save it
* this should be done with render-distance but whateva
*/
- int clossnessDistance = 50;
+ int closenessDistance = 50;
private int waitDelay = 0;
public MapPlayerProcessor(DungeonContext context) {
@@ -90,7 +92,7 @@ public class MapPlayerProcessor {
Vec4b vec4 = stringVec4bEntry.getValue();
if (!mapIconToPlayerMap.containsValue(mapDecString)) {
- if (DungeonsGuide.getDungeonsGuide().verbose) logger.info("mapIconToPlayerMap dosent have Player");
+ if (DungeonsGuide.getDungeonsGuide().verbose) logger.info("mapIconToPlayerMap doesn't have Player");
int x = vec4.func_176112_b() / 2 + 64;
int y = vec4.func_176113_c() / 2 + 64;
@@ -126,7 +128,7 @@ public class MapPlayerProcessor {
int y2 = bbb.func_176113_c() / 2 + 64;
int dx = x2 - x;
int dy = y2 - y;
- if (dx * dx + dy * dy < clossnessDistance) {
+ if (dx * dx + dy * dy < closenessDistance) {
shouldSave = false;
break;
}
@@ -168,7 +170,7 @@ public class MapPlayerProcessor {
BlockPos pos = entityPlayer.getPosition();
int dx = mapPos.getX() - pos.getX();
int dz = mapPos.getZ() - pos.getZ();
- return dx * dx + dz * dz < clossnessDistance;
+ return dx * dx + dz * dz < closenessDistance;
}
diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/pathfinding/ThetaStar.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/pathfinding/ThetaStar.java
index d48487a4..2b441dd3 100644
--- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/pathfinding/ThetaStar.java
+++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/pathfinding/ThetaStar.java
@@ -143,7 +143,7 @@ public class ThetaStar {
boolean flag = false;
if (n. parent != null) {
float tempGScore = n.parent.g + distSq(n.parent.coordinate.x - neighbor.coordinate.x, n.parent.coordinate.y - neighbor.coordinate.y, n.parent.coordinate.z - neighbor.coordinate.z);
- if (tempGScore < neighbor.g && lineofsight(n.parent, neighbor)) {
+ if (tempGScore < neighbor.g && lineOfSight(n.parent, neighbor)) {
neighbor.parent = n.parent;
neighbor.g = tempGScore;
neighbor.f = tempGScore + distSq(goalNode.coordinate.x - neighbor.coordinate.x, goalNode.coordinate.y - neighbor.coordinate.y, goalNode.coordinate.z - neighbor.coordinate.z);
@@ -168,7 +168,7 @@ public class ThetaStar {
return true;
}
- private boolean lineofsight(Node a, Node b) {
+ private boolean lineOfSight(Node a, Node b) {
if (a == null || b == null) return false;
float sx = a.coordinate.x, sy = a.coordinate.y, sz = a.coordinate.z;
int ex = b.coordinate.x, ey = b.coordinate.y, ez = b.coordinate.z;
diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomedit/panes/ActionTreeDisplayPane.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomedit/panes/ActionTreeDisplayPane.java
index 813e3943..3b2dc19f 100755
--- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomedit/panes/ActionTreeDisplayPane.java
+++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomedit/panes/ActionTreeDisplayPane.java
@@ -72,10 +72,10 @@ public class ActionTreeDisplayPane extends MPanel {
GlStateManager.popMatrix();
}
- public int renderTree(ActionTree actionTree, int x, int y, FontRenderer fr, Point drawLineFrom, HashMap<ActionTree, Point> drawmPoints) {
- if (drawmPoints.containsKey(actionTree)) {
+ public int renderTree(ActionTree actionTree, int x, int y, FontRenderer fr, Point drawLineFrom, HashMap<ActionTree, Point> drawnPoints) {
+ if (drawnPoints.containsKey(actionTree)) {
// recursive, fu
- Point pt = drawmPoints.get(actionTree);
+ Point pt = drawnPoints.get(actionTree);
GlStateManager.pushMatrix();
@@ -124,10 +124,10 @@ public class ActionTreeDisplayPane extends MPanel {
}
Point pt = new Point(x + dim.width / 2, y + dim.height);
- drawmPoints.put(actionTree, new Point(x + dim.width / 2, y + dim.height / 2));
+ drawnPoints.put(actionTree, new Point(x + dim.width / 2, y + dim.height / 2));
int xOff = 0;
for (ActionTree tree:actionTree.getChildren()) {
- xOff += renderTree(tree, x + xOff, y + dim.height + 10, fr, pt, drawmPoints) + 10;
+ xOff += renderTree(tree, x + xOff, y + dim.height + 10, fr, pt, drawnPoints) + 10;
}
return Math.max(xOff, dim.width);
}
diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomedit/panes/GeneralEditPane.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomedit/panes/GeneralEditPane.java
index 3ad44741..9d117abd 100755
--- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomedit/panes/GeneralEditPane.java
+++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomedit/panes/GeneralEditPane.java
@@ -229,7 +229,7 @@ public class GeneralEditPane extends MPanel {
byte[] blocks = new byte[size];
byte[] meta = new byte[size];
byte[] extra = new byte[size];
- byte[] extranibble = new byte[(int) Math.ceil(size / 2.0)];
+ byte[] extraNibble = new byte[(int) Math.ceil(size / 2.0)];
boolean extraEx = false;
NBTTagList tileEntitiesList = new NBTTagList();
@@ -264,11 +264,11 @@ public class GeneralEditPane extends MPanel {
}
}
}
- for (int i = 0; i < extranibble.length; i++) {
+ for (int i = 0; i < extraNibble.length; i++) {
if (i * 2 + 1 < extra.length) {
- extranibble[i] = (byte) ((extra[i * 2 + 0] << 4) | extra[i * 2 + 1]);
+ extraNibble[i] = (byte) ((extra[i * 2 + 0] << 4) | extra[i * 2 + 1]);
} else {
- extranibble[i] = (byte) (extra[i * 2 + 0] << 4);
+ extraNibble[i] = (byte) (extra[i * 2 + 0] << 4);
}
}
@@ -277,7 +277,7 @@ public class GeneralEditPane extends MPanel {
compound.setByteArray("Data", meta);
compound.setString("Materials", "Alpha");
if (extraEx) {
- compound.setByteArray("AddBlocks", extranibble);
+ compound.setByteArray("AddBlocks", extraNibble);
}
compound.setTag("Entities", new NBTTagList());
compound.setTag("TileEntities", tileEntitiesList);
diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomedit/valueedit/ValueEditAColor.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomedit/valueedit/ValueEditAColor.java
index 7c72af8b..c14fed97 100755
--- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomedit/valueedit/ValueEditAColor.java
+++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomedit/valueedit/ValueEditAColor.java
@@ -152,7 +152,7 @@ public class ValueEditAColor extends MPanel implements ValueEdit<AColor> {
int width = getBounds().width - 60;
Tessellator tessellator = Tessellator.getInstance();
WorldRenderer worldrenderer = tessellator.getWorldRenderer();
- int shademodel = GL11.glGetInteger(GL11.GL_SHADE_MODEL);
+ int shadeModel = GL11.glGetInteger(GL11.GL_SHADE_MODEL);
GlStateManager.shadeModel(GL11.GL_SMOOTH);
GlStateManager.enableBlend();
GlStateManager.disableDepth();
@@ -206,7 +206,7 @@ public class ValueEditAColor extends MPanel implements ValueEdit<AColor> {
GL11.glVertex3f(MathHelper.sin(rad) * radius + cx, MathHelper.cos(rad) * radius + cy, 0);
}
GL11.glEnd();
- GlStateManager.shadeModel(shademodel);
+ GlStateManager.shadeModel(shadeModel);
GlStateManager.color(1,1,1,1);
worldrenderer.begin(GL11.GL_LINE_LOOP, DefaultVertexFormats.POSITION);
diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomedit/valueedit/ValueEditColor.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomedit/valueedit/ValueEditColor.java
index cd6c4d40..2ca1b730 100755
--- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomedit/valueedit/ValueEditColor.java
+++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomedit/valueedit/ValueEditColor.java
@@ -134,7 +134,7 @@ public class ValueEditColor extends MPanel implements ValueEdit<Color> {
int width = getBounds().width - 30;
Tessellator tessellator = Tessellator.getInstance();
WorldRenderer worldrenderer = tessellator.getWorldRenderer();
- int shademodel = GL11.glGetInteger(GL11.GL_SHADE_MODEL);
+ int shadeModel = GL11.glGetInteger(GL11.GL_SHADE_MODEL);
GlStateManager.shadeModel(GL11.GL_SMOOTH);
GlStateManager.enableBlend();
GlStateManager.disableTexture2D();
@@ -172,7 +172,7 @@ public class ValueEditColor extends MPanel implements ValueEdit<Color> {
GL11.glVertex3f(MathHelper.sin(rad) * radius + cx, MathHelper.cos(rad) * radius + cy, 0);
}
GL11.glEnd();
- GlStateManager.shadeModel(shademodel);
+ GlStateManager.shadeModel(shadeModel);
GlStateManager.color(1,1,1,1);
worldrenderer.begin(GL11.GL_LINE_LOOP, DefaultVertexFormats.POSITION);
diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomfinder/DungeonRoom.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomfinder/DungeonRoom.java
index 236dcb40..5957ebf3 100755
--- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomfinder/DungeonRoom.java
+++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomfinder/DungeonRoom.java
@@ -28,7 +28,6 @@ import kr.syeyoung.dungeonsguide.mod.dungeon.DungeonContext;
import kr.syeyoung.dungeonsguide.mod.dungeon.doorfinder.DungeonDoor;
import kr.syeyoung.dungeonsguide.mod.dungeon.doorfinder.EDungeonDoorType;
import kr.syeyoung.dungeonsguide.mod.dungeon.events.SerializableBlockPos;
-import kr.syeyoung.dungeonsguide.mod.dungeon.events.impl.DungeonRoomDiscoverEvent;
import kr.syeyoung.dungeonsguide.mod.dungeon.events.impl.DungeonRoomMatchEvent;
import kr.syeyoung.dungeonsguide.mod.dungeon.events.impl.DungeonStateChangeEvent;
import kr.syeyoung.dungeonsguide.mod.dungeon.map.DungeonRoomScaffoldParser;
@@ -107,7 +106,7 @@ public class DungeonRoom {
private final Map<BlockPos, AStarCornerCut> activeBetterAStarCornerCut = new HashMap<>();
private final Map<BlockPos, ThetaStar> activeThetaStar = new HashMap<>();
- public ScheduledFuture<List<Vec3>> createEntityPathTo(IBlockAccess blockaccess, Entity entityIn, BlockPos targetPos, float dist, int timeout) {
+ public ScheduledFuture<List<Vec3>> createEntityPathTo(IBlockAccess blockAccess, Entity entityIn, BlockPos targetPos, float dist, int timeout) {
FeaturePathfindStrategy.PathfindStrategy pathfindStrategy = FeatureRegistry.SECRET_PATHFIND_STRATEGY.getPathfindStrat();
if (pathfindStrategy == FeaturePathfindStrategy.PathfindStrategy.JPS_LEGACY) {
return asyncPathFinder.schedule(() -> {
@@ -141,7 +140,7 @@ public class DungeonRoom {
} else {
return asyncPathFinder.schedule(() -> {
PathFinder pathFinder = new PathFinder(nodeProcessorDungeonRoom);
- PathEntity latest = pathFinder.createEntityPathTo(blockaccess, entityIn, targetPos, dist);
+ PathEntity latest = pathFinder.createEntityPathTo(blockAccess, entityIn, targetPos, dist);
if (latest != null) {
List<Vec3> poses = new ArrayList<>();
for (int i = 0; i < latest.getCurrentPathLength(); i++) {
@@ -376,18 +375,18 @@ public class DungeonRoom {
for (int l1 = i1; l1 < j1; ++l1) {
for (int i2 = k - 1; i2 < l; ++i2) {
blockPos.set(k1, i2, l1);
- IBlockState iblockstate1 = cachedWorld.getBlockState(blockPos);
- Block b = iblockstate1.getBlock();
+ IBlockState iBlockState1 = cachedWorld.getBlockState(blockPos);
+ Block b = iBlockState1.getBlock();
if (!b.getMaterial().blocksMovement())continue;
if (b.isFullCube() && i2 == k-1) continue;
- if (iblockstate1.equals( NodeProcessorDungeonRoom.preBuilt)) continue;
+ if (iBlockState1.equals( NodeProcessorDungeonRoom.preBuilt)) continue;
if (b.isFullCube()) {
theBit |= (3L << bitStart);
arr[location] = theBit;
return true;
}
try {
- b.addCollisionBoxesToList(cachedWorld, blockPos, iblockstate1, bb, list, null);
+ b.addCollisionBoxesToList(cachedWorld, blockPos, iBlockState1, bb, list, null);
} catch (Exception e) {
return true;
}
diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomfinder/DungeonRoomInfoRegistry.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomfinder/DungeonRoomInfoRegistry.java
index 1afc40dc..45e019ff 100755
--- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomfinder/DungeonRoomInfoRegistry.java
+++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomfinder/DungeonRoomInfoRegistry.java
@@ -99,7 +99,7 @@ public class DungeonRoomInfoRegistry {
public static void saveAll(File dir) {
dir.mkdirs();
boolean isDev = Minecraft.getMinecraft().getSession().getPlayerID().replace("-","").equals("e686fe0aab804a71ac7011dc8c2b534c");
- StringBuilder nameidstring = new StringBuilder("name,uuid,processsor,secrets");
+ StringBuilder nameIDString = new StringBuilder("name,uuid,processsor,secrets");
StringBuilder ids = new StringBuilder();
for (DungeonRoomInfo dungeonRoomInfo : registered) {
try {
@@ -110,13 +110,13 @@ public class DungeonRoomInfoRegistry {
oos.flush();
oos.close();
- nameidstring.append("\n").append(dungeonRoomInfo.getName()).append(",").append(dungeonRoomInfo.getUuid()).append(",").append(dungeonRoomInfo.getProcessorId()).append(",").append(dungeonRoomInfo.getTotalSecrets());
+ nameIDString.append("\n").append(dungeonRoomInfo.getName()).append(",").append(dungeonRoomInfo.getUuid()).append(",").append(dungeonRoomInfo.getProcessorId()).append(",").append(dungeonRoomInfo.getTotalSecrets());
ids.append("roomdata/").append(dungeonRoomInfo.getUuid()).append(".roomdata\n");
} catch (Exception e) {e.printStackTrace();}
}
try {
- Files.write(nameidstring.toString(), new File(dir, "roomidmapping.csv"), Charset.defaultCharset());
+ Files.write(nameIDString.toString(), new File(dir, "roomidmapping.csv"), Charset.defaultCharset());
Files.write(ids.toString(), new File(dir, "datas.txt"), Charset.defaultCharset());
} catch (IOException e) {
e.printStackTrace();
diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomfinder/RoomMatcher.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomfinder/RoomMatcher.java
index bdc6d516..7db79b6b 100755
--- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomfinder/RoomMatcher.java
+++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomfinder/RoomMatcher.java
@@ -57,7 +57,7 @@ public class RoomMatcher {
}
triedMatch = true;
- int lowestcost = 10;
+ int lowestCost = 10;
int lowestRot = 0;
DungeonRoomInfo bestMatch = null;
for (int rotation = 0; rotation < 4; rotation++) {
@@ -74,8 +74,8 @@ public class RoomMatcher {
this.rotation = rotation;
return match;
}
- if (cost < lowestcost) {
- lowestcost = cost;
+ if (cost < lowestCost) {
+ lowestCost = cost;
bestMatch = roomInfo;
lowestRot = rotation;
}
diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomprocessor/GeneralRoomProcessor.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomprocessor/GeneralRoomProcessor.java
index f2ab49ad..83714937 100755
--- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomprocessor/GeneralRoomProcessor.java
+++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomprocessor/GeneralRoomProcessor.java
@@ -267,13 +267,13 @@ public class GeneralRoomProcessor implements RoomProcessor {
int secretsIndex = text.indexOf("Secrets");
int secrets = 0;
if (secretsIndex != -1) {
- int theindex = 0;
+ int theIndex = 0;
for (int i = secretsIndex; i >= 0; i--) {
if (text.startsWith("§7", i)) {
- theindex = i;
+ theIndex = i;
}
}
- String it = text.substring(theindex + 2, secretsIndex - 1);
+ String it = text.substring(theIndex + 2, secretsIndex - 1);
secrets = Integer.parseInt(it.split("/")[1]);
}
diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomprocessor/RoomProcessorBlazeSolver.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomprocessor/RoomProcessorBlazeSolver.java
index fb0f189d..bd2e4c79 100755
--- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomprocessor/RoomProcessorBlazeSolver.java
+++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomprocessor/RoomProcessorBlazeSolver.java
@@ -46,7 +46,7 @@ public class RoomProcessorBlazeSolver extends GeneralRoomProcessor {
private List<EntityArmorStand> entityList = new ArrayList<EntityArmorStand>();
private List<EntityBlaze> blazeList = new ArrayList<>();
private EntityArmorStand next;
- private EntityBlaze nextBlaze, theoneafterit;
+ private EntityBlaze currentBlaze, nextBlaze;
public RoomProcessorBlazeSolver(DungeonRoom dungeonRoom) {
super(dungeonRoom);
Object highToLow = dungeonRoom.getDungeonRoomInfo().getProperties().get("order");
@@ -89,16 +89,16 @@ public class RoomProcessorBlazeSolver extends GeneralRoomProcessor {
if (entityList.size() > 0) {
next = entityList.get(0);
- nextBlaze = blazeList.stream().min(Comparator.comparingDouble(e -> e.getDistanceSqToEntity(next))).orElse(null);
+ currentBlaze = blazeList.stream().min(Comparator.comparingDouble(e -> e.getDistanceSqToEntity(next))).orElse(null);
} else {
next = null;
- nextBlaze = null;
+ currentBlaze = null;
}
if (entityList.size() > 1) {
- EntityArmorStand thenextone = entityList.get(1);
- theoneafterit = blazeList.stream().min(Comparator.comparingDouble(e -> e.getDistanceSqToEntity(thenextone))).orElse(null);
+ EntityArmorStand theNextOne = entityList.get(1);
+ nextBlaze = blazeList.stream().min(Comparator.comparingDouble(e -> e.getDistanceSqToEntity(theNextOne))).orElse(null);
} else {
- theoneafterit = null;
+ nextBlaze = null;
}
}
@@ -154,9 +154,9 @@ public class RoomProcessorBlazeSolver extends GeneralRoomProcessor {
boolean border = true;
RenderUtils.highlightBox(entity, AxisAlignedBB.fromBounds(-0.8,0, -0.8, 0.8, 2, 0.8), FeatureRegistry.SOLVER_BLAZE.getBlazeColor(), partialTicks, false);
- if (entity == theoneafterit) {
+ if (entity == nextBlaze) {
RenderUtils.highlightBox(entity, AxisAlignedBB.fromBounds(-0.8,0, -0.8, 0.8, 2, 0.8), FeatureRegistry.SOLVER_BLAZE.getNextUpBlazeColor(), partialTicks, false);
- } else if (entity == nextBlaze)
+ } else if (entity == currentBlaze)
RenderUtils.highlightBox(entity, AxisAlignedBB.fromBounds(-0.8,0, -0.8, 0.8, 2, 0.8), FeatureRegistry.SOLVER_BLAZE.getNextBlazeColor(), partialTicks, false);
GlStateManager.color(1,1,1,1);
diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomprocessor/RoomProcessorIcePath.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomprocessor/RoomProcessorIcePath.java
index a615d218..d46264f7 100755
--- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomprocessor/RoomProcessorIcePath.java
+++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomprocessor/RoomProcessorIcePath.java
@@ -53,10 +53,10 @@ public class RoomProcessorIcePath extends GeneralRoomProcessor {
public RoomProcessorIcePath(DungeonRoom dungeonRoom) {
super(dungeonRoom);
- findSilverFishanddoStuff();
+ findSilverFishAndDoStuff();
}
- public void findSilverFishanddoStuff() {
+ public void findSilverFishAndDoStuff() {
final BlockPos low = getDungeonRoom().getMin();
final BlockPos high = getDungeonRoom().getMax();
List<EntitySilverfish> silverfishs = getDungeonRoom().getContext().getWorld().getEntities(EntitySilverfish.class, new Predicate<EntitySilverfish>() {
@@ -104,7 +104,7 @@ public class RoomProcessorIcePath extends GeneralRoomProcessor {
public void tick() {
super.tick();
if (err || silverfish.isDead) {
- findSilverFishanddoStuff();
+ findSilverFishAndDoStuff();
if (err) return;
}
if (silverfish.getPosition().equals(lastSilverfishLoc)) {
diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomprocessor/RoomProcessorRiddle.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomprocessor/RoomProcessorRiddle.java
index f40dc53f..ff358604 100755
--- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomprocessor/RoomProcessorRiddle.java
+++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomprocessor/RoomProcessorRiddle.java
@@ -61,10 +61,10 @@ public class RoomProcessorRiddle extends GeneralRoomProcessor {
if (!ch2.startsWith("§e[NPC] ")) {
return;
}
- String watsaid = TextUtils.stripColor(ch2.split(":")[1]).trim();
+ String riddleHint = TextUtils.stripColor(ch2.split(":")[1]).trim();
boolean foundMatch = false;
for (Pattern p:patternList) {
- if (p.matcher(watsaid).matches()) {
+ if (p.matcher(riddleHint).matches()) {
foundMatch = true;
break;
}
diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomprocessor/bombdefuse/RoomProcessorBombDefuseSolver.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomprocessor/bombdefuse/RoomProcessorBombDefuseSolver.java
index 68b86462..2af9cd76 100644
--- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomprocessor/bombdefuse/RoomProcessorBombDefuseSolver.java
+++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomprocessor/bombdefuse/RoomProcessorBombDefuseSolver.java
@@ -171,9 +171,9 @@ public class RoomProcessorBombDefuseSolver extends GeneralRoomProcessor {
for (ChamberSet ch:chambers) {
if (ch.getLeft() != null && ch.getLeft().getProcessor() != null)
- ch.getLeft().getProcessor().onDataRecieve(compound);
+ ch.getLeft().getProcessor().onDataReceive(compound);
if (ch.getRight() != null && ch.getRight().getProcessor() != null)
- ch.getRight().getProcessor().onDataRecieve(compound);
+ ch.getRight().getProcessor().onDataReceive(compound);
}
} catch (IOException e2) {
e2.printStackTrace();
@@ -201,9 +201,9 @@ public class RoomProcessorBombDefuseSolver extends GeneralRoomProcessor {
for (ChamberSet ch:chambers) {
if (ch.getLeft() != null && ch.getLeft().getProcessor() != null)
- ch.getLeft().getProcessor().onDataRecieve(compound);
+ ch.getLeft().getProcessor().onDataReceive(compound);
if (ch.getRight() != null && ch.getRight().getProcessor() != null)
- ch.getRight().getProcessor().onDataRecieve(compound);
+ ch.getRight().getProcessor().onDataReceive(compound);
}
} catch (Throwable t) {
t.printStackTrace();
diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomprocessor/bombdefuse/chambers/BDChamber.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomprocessor/bombdefuse/chambers/BDChamber.java
index 14307f20..5756e051 100644
--- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomprocessor/bombdefuse/chambers/BDChamber.java
+++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomprocessor/bombdefuse/chambers/BDChamber.java
@@ -43,7 +43,7 @@ public class BDChamber {
private ChamberProcessor processor;
- // for whatever's sake, 6: z, 9: x. Starts from botoom right, left, then up
+ // for whatever's sake, 6: z, 9: x. Starts from bottom right, left, then up
public OffsetPoint getOffsetPoint(int x, int z) {
return chamberBlocks.getOffsetPointList().get(z * 9 + x);
diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomprocessor/bombdefuse/chambers/ChamberProcessor.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomprocessor/bombdefuse/chambers/ChamberProcessor.java
index c4d63f42..db6a0f61 100644
--- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomprocessor/bombdefuse/chambers/ChamberProcessor.java
+++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomprocessor/bombdefuse/chambers/ChamberProcessor.java
@@ -22,6 +22,6 @@ import kr.syeyoung.dungeonsguide.mod.dungeon.roomprocessor.RoomProcessor;
import net.minecraft.nbt.NBTTagCompound;
public interface ChamberProcessor extends RoomProcessor {
- void onDataRecieve(NBTTagCompound compound);
+ void onDataReceive(NBTTagCompound compound);
String getName();
}
diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomprocessor/bombdefuse/chambers/GeneralDefuseChamberProcessor.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomprocessor/bombdefuse/chambers/GeneralDefuseChamberProcessor.java
index 44c88499..30a685ee 100644
--- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomprocessor/bombdefuse/chambers/GeneralDefuseChamberProcessor.java
+++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomprocessor/bombdefuse/chambers/GeneralDefuseChamberProcessor.java
@@ -51,7 +51,7 @@ public abstract class GeneralDefuseChamberProcessor implements ChamberProcessor
@Override
- public void onDataRecieve(NBTTagCompound compound) {
+ public void onDataReceive(NBTTagCompound compound) {
}
diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomprocessor/bombdefuse/chambers/arrow/ArrowLeftProcessor.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomprocessor/bombdefuse/chambers/arrow/ArrowLeftProcessor.java
index 06677020..384dfe05 100644
--- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomprocessor/bombdefuse/chambers/arrow/ArrowLeftProcessor.java
+++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomprocessor/bombdefuse/chambers/arrow/ArrowLeftProcessor.java
@@ -94,7 +94,7 @@ public class ArrowLeftProcessor extends GeneralDefuseChamberProcessor {
}
@Override
- public void onDataRecieve(NBTTagCompound compound) {
+ public void onDataReceive(NBTTagCompound compound) {
if (3 == compound.getByte("a")) {
answer = compound.getInteger("b");
for (int i = 8; i >= 0; i--) {
diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomprocessor/bombdefuse/chambers/arrow/ArrowRightProcessor.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomprocessor/bombdefuse/chambers/arrow/ArrowRightProcessor.java
index fc855b6f..8808ecce 100644
--- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomprocessor/bombdefuse/chambers/arrow/ArrowRightProcessor.java
+++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomprocessor/bombdefuse/chambers/arrow/ArrowRightProcessor.java
@@ -81,7 +81,7 @@ public class ArrowRightProcessor extends GeneralDefuseChamberProcessor {
}
@Override
- public void onDataRecieve(NBTTagCompound compound) {
+ public void onDataReceive(NBTTagCompound compound) {
if (3 == compound.getByte("a")) {
answer = compound.getInteger("b");
for (int i = 8; i >= 0; i--) {
diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomprocessor/bombdefuse/chambers/color/ColorLeftProcessor.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomprocessor/bombdefuse/chambers/color/ColorLeftProcessor.java
index c5432dab..22cace19 100644
--- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomprocessor/bombdefuse/chambers/color/ColorLeftProcessor.java
+++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomprocessor/bombdefuse/chambers/color/ColorLeftProcessor.java
@@ -146,7 +146,7 @@ public class ColorLeftProcessor extends GeneralDefuseChamberProcessor {
}
@Override
- public void onDataRecieve(NBTTagCompound compound) {
+ public void onDataReceive(NBTTagCompound compound) {
if (6 == compound.getByte("a")) {
w1 = Block.getBlockById(compound.getByte("f"));
w2 = Block.getBlockById(compound.getByte("s"));
diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomprocessor/bombdefuse/chambers/color/ColorRightProcessor.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomprocessor/bombdefuse/chambers/color/ColorRightProcessor.java
index 06b270ce..92d46a40 100644
--- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomprocessor/bombdefuse/chambers/color/ColorRightProcessor.java
+++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomprocessor/bombdefuse/chambers/color/ColorRightProcessor.java
@@ -91,7 +91,7 @@ public class ColorRightProcessor extends GeneralDefuseChamberProcessor {
}
@Override
- public void onDataRecieve(NBTTagCompound compound) {
+ public void onDataReceive(NBTTagCompound compound) {
if (7 == compound.getByte("a")) {
answer = compound.getInteger("b");
b3b = (byte) (answer / 10000);
diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomprocessor/bombdefuse/chambers/creeper/CreeperLeftProcessor.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomprocessor/bombdefuse/chambers/creeper/CreeperLeftProcessor.java
index b0843dd4..5f5fb9d3 100644
--- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomprocessor/bombdefuse/chambers/creeper/CreeperLeftProcessor.java
+++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomprocessor/bombdefuse/chambers/creeper/CreeperLeftProcessor.java
@@ -88,7 +88,7 @@ public class CreeperLeftProcessor extends GeneralDefuseChamberProcessor {
}
@Override
- public void onDataRecieve(NBTTagCompound compound) {
+ public void onDataReceive(NBTTagCompound compound) {
if (2 == compound.getByte("a")) {
answer = compound.getInteger("b");
}
diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomprocessor/bombdefuse/chambers/creeper/CreeperRightProcessor.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomprocessor/bombdefuse/chambers/creeper/CreeperRightProcessor.java
index f3042e18..fbdb6476 100644
--- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomprocessor/bombdefuse/chambers/creeper/CreeperRightProcessor.java
+++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomprocessor/bombdefuse/chambers/creeper/CreeperRightProcessor.java
@@ -66,7 +66,7 @@ public class CreeperRightProcessor extends GeneralDefuseChamberProcessor {
}
}
@Override
- public void onDataRecieve(NBTTagCompound compound) {
+ public void onDataReceive(NBTTagCompound compound) {
if (2 == compound.getByte("a")) {
answer = compound.getInteger("b");
}
diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomprocessor/bombdefuse/chambers/maze/MazeRightProcessor.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomprocessor/bombdefuse/chambers/maze/MazeRightProcessor.java
index 62d18f7a..5b48cb1c 100644
--- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomprocessor/bombdefuse/chambers/maze/MazeRightProcessor.java
+++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomprocessor/bombdefuse/chambers/maze/MazeRightProcessor.java
@@ -65,7 +65,7 @@ public class MazeRightProcessor extends GeneralDefuseChamberProcessor {
}
@Override
- public void onDataRecieve(NBTTagCompound compound) {
+ public void onDataReceive(NBTTagCompound compound) {
if (5 == compound.getByte("a")) {
int latestRequestid = compound.getInteger("b");
latestRequest = Block.getBlockById(latestRequestid);
diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomprocessor/bombdefuse/chambers/number/NumberLeftProcessor.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomprocessor/bombdefuse/chambers/number/NumberLeftProcessor.java
index 03dc2569..6af2392d 100644
--- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomprocessor/bombdefuse/chambers/number/NumberLeftProcessor.java
+++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomprocessor/bombdefuse/chambers/number/NumberLeftProcessor.java
@@ -90,7 +90,7 @@ public class NumberLeftProcessor extends GeneralDefuseChamberProcessor {
}
@Override
- public void onDataRecieve(NBTTagCompound compound) {
+ public void onDataReceive(NBTTagCompound compound) {
if (1 == compound.getByte("a")) {
answer = compound.getInteger("b");
d1 = answer / 1000;
diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomprocessor/bombdefuse/chambers/number/NumberRightProcessor.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomprocessor/bombdefuse/chambers/number/NumberRightProcessor.java
index 2c3c7e8e..283a8019 100644
--- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomprocessor/bombdefuse/chambers/number/NumberRightProcessor.java
+++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomprocessor/bombdefuse/chambers/number/NumberRightProcessor.java
@@ -77,7 +77,7 @@ public class NumberRightProcessor extends GeneralDefuseChamberProcessor {
}
@Override
- public void onDataRecieve(NBTTagCompound compound) {
+ public void onDataReceive(NBTTagCompound compound) {
if (1 == compound.getByte("a")) {
answer = compound.getInteger("b");
d1 = answer / 1000;
diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomprocessor/boxpuzzle/RoomProcessorBoxSolver.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomprocessor/boxpuzzle/RoomProcessorBoxSolver.java
index 9fd049bd..c8de6e5c 100755
--- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomprocessor/boxpuzzle/RoomProcessorBoxSolver.java
+++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomprocessor/boxpuzzle/RoomProcessorBoxSolver.java
@@ -100,10 +100,10 @@ public class RoomProcessorBoxSolver extends GeneralRoomProcessor {
super.tick();
if (!FeatureRegistry.SOLVER_BOX.isEnabled()) return;
if (bugged) return;
- byte[][] currboard = buildCurrentState();
+ byte[][] currBoard = buildCurrentState();
if (puzzleSolvingThread == null) {
calcDone = false;
- puzzleSolvingThread = new BoxPuzzleSolvingThread(currboard, 0, 6, new Runnable() {
+ puzzleSolvingThread = new BoxPuzzleSolvingThread(currBoard, 0, 6, new Runnable() {
@Override
public void run() {
calcDone = true;
@@ -127,7 +127,7 @@ public class RoomProcessorBoxSolver extends GeneralRoomProcessor {
calcDone = false;
if (puzzleSolvingThread != null)
puzzleSolvingThread.stop();
- puzzleSolvingThread = new BoxPuzzleSolvingThread(currboard, 0, 6, new Runnable() {
+ puzzleSolvingThread = new BoxPuzzleSolvingThread(currBoard, 0, 6, new Runnable() {
@Override
public void run() {
calcDone = true;
@@ -155,7 +155,7 @@ public class RoomProcessorBoxSolver extends GeneralRoomProcessor {
ChatTransmitter.addToQueue(new ChatComponentText("§eDungeons Guide §7:: §eBox Solver §7:: Solution Found!"));
}
step = 0;
- lastState = currboard;
+ lastState = currBoard;
calcDone2 = false;
pathFindReq = true;
@@ -165,11 +165,11 @@ public class RoomProcessorBoxSolver extends GeneralRoomProcessor {
if (lastState == null) return;
boolean moved = false;
label:
- for (int y = 0 ; y < currboard.length; y++) {
- for (int x = 0; x < currboard[y].length; x++) {
- if (lastState[y][x] != currboard[y][x]) {
+ for (int y = 0 ; y < currBoard.length; y++) {
+ for (int x = 0; x < currBoard[y].length; x++) {
+ if (lastState[y][x] != currBoard[y][x]) {
moved = true;
- lastState = currboard;
+ lastState = currBoard;
break label;
}
}
@@ -179,7 +179,7 @@ public class RoomProcessorBoxSolver extends GeneralRoomProcessor {
step++;
}
- Point player = getPlayerPos(currboard);
+ Point player = getPlayerPos(currBoard);
boolean currYState = Minecraft.getMinecraft().thePlayer.getPosition().getY() < 68;
if (((currYState && !player.equals(lastPlayer)) || (currYState != yState) || (moved) || pathFindReq) && solution != null) {
Point target = null;
@@ -187,7 +187,7 @@ public class RoomProcessorBoxSolver extends GeneralRoomProcessor {
BoxPuzzleSolvingThread.BoxMove boxMove = solution.get(step);
target = new Point(boxMove.x - boxMove.dx, boxMove.y - boxMove.dy);
}
- List<Point> semi_pathFound = pathfind(currboard, player, target);
+ List<Point> semi_pathFound = pathfind(currBoard, player, target);
pathFound = new LinkedList<BlockPos>();
for (Point point : semi_pathFound) {
pathFound.add(poses[point.y][point.x].add(0,-1,0));
@@ -203,7 +203,7 @@ public class RoomProcessorBoxSolver extends GeneralRoomProcessor {
Point player = new Point(0,6);
totalPath = new LinkedList<BlockPos>();
totalPushedBlocks = new LinkedList<BlockPos>();
- byte[][] currboard = buildCurrentState();
+ byte[][] currBoard = buildCurrentState();
for (int i = 0; i <= solution.size(); i++) {
Point target = null;
BoxPuzzleSolvingThread.BoxMove boxMove = null;
@@ -211,7 +211,7 @@ public class RoomProcessorBoxSolver extends GeneralRoomProcessor {
boxMove = solution.get(i);
target = new Point(boxMove.x - boxMove.dx, boxMove.y - boxMove.dy);
}
- List<Point> semi_pathFound = pathfind(currboard, player, target);
+ List<Point> semi_pathFound = pathfind(currBoard, player, target);
for (int i1 = semi_pathFound.size() - 1; i1 >= 0; i1--) {
Point point = semi_pathFound.get(i1);
totalPath.add(poses[point.y][point.x].add(0, -1, 0));
@@ -219,7 +219,7 @@ public class RoomProcessorBoxSolver extends GeneralRoomProcessor {
player = target;
if (boxMove != null) {
- BoxPuzzleSolvingThread.push(currboard, boxMove.x, boxMove.y, boxMove.dx, boxMove.dy);
+ BoxPuzzleSolvingThread.push(currBoard, boxMove.x, boxMove.y, boxMove.dx, boxMove.dy);
int fromX = boxMove.x - boxMove.dx;
int fromY = boxMove.y - boxMove.dy;
@@ -262,11 +262,11 @@ public class RoomProcessorBoxSolver extends GeneralRoomProcessor {
public List<Point> pathfind(byte[][] map, Point start, Point target2) {
int[][] distances = new int[map.length][map[0].length];
- Queue<Point> evalulate = new LinkedList<Point>();
- evalulate.add(start);
+ Queue<Point> evaluate = new LinkedList<Point>();
+ evaluate.add(start);
Point target = null;
- while (!evalulate.isEmpty()) {
- Point p = evalulate.poll();
+ while (!evaluate.isEmpty()) {
+ Point p = evaluate.poll();
if (p.equals(target2) || (target2 == null &&p.y == 0)) {
target = p;
break;
@@ -283,7 +283,7 @@ public class RoomProcessorBoxSolver extends GeneralRoomProcessor {
max = distances[resY][resX];
}
if (distances[resY][resX] == 0 && (map[resY][resX] == 0 ||map[resY][resX] == -1)) {
- evalulate.add(new Point(resX, resY));
+ evaluate.add(new Point(resX, resY));
}
}
distances[p.y][p.x] = max + 1;
diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomprocessor/waterpuzzle/WaterBoard.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomprocessor/waterpuzzle/WaterBoard.java
index a3a390c0..eece3057 100755
--- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomprocessor/waterpuzzle/WaterBoard.java
+++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomprocessor/waterpuzzle/WaterBoard.java
@@ -229,16 +229,16 @@ public class WaterBoard {
boolean followWater = getNodeAt(asd.getX() - 1, asd.getY()) != null && leverStates.contains(getNodeAt(asd.getX() - 1, asd.getY()).getCondition())
&& getNodeAt(asd.getX() - 2, asd.getY()) != null && leverStates.contains(getNodeAt(asd.getX() - 2, asd.getY()).getCondition());
for (int i = asd.getX(); i < asd.getX() + 8; i++) {
- WaterNode nodehere = getNodeAt(i, asd.getY());
- if (nodehere == null) break;
- if (followWater && !nodehere.isWaterFilled(w)) break;
- if (!nodehere.canWaterGoThrough()) break;
- if (!leverStates.contains(nodehere.getCondition()) && !nodehere.isWaterFilled(w)) break;
- if (nodehere.getCondition() != null && leverStates.contains(nodehere.getCondition().invert()) && nodehere.isWaterFilled(w)) waterBlockingStates.add(nodehere.getCondition().invert());
+ WaterNode nodeHere = getNodeAt(i, asd.getY());
+ if (nodeHere == null) break;
+ if (followWater && !nodeHere.isWaterFilled(w)) break;
+ if (!nodeHere.canWaterGoThrough()) break;
+ if (!leverStates.contains(nodeHere.getCondition()) && !nodeHere.isWaterFilled(w)) break;
+ if (nodeHere.getCondition() != null && leverStates.contains(nodeHere.getCondition().invert()) && nodeHere.isWaterFilled(w)) waterBlockingStates.add(nodeHere.getCondition().invert());
WaterNode down = getNodeAt(i, asd.getY() + 1);
if (i != asd.getX())
- followWater = nodehere.isWaterFilled(w) && (down == null || (down.canWaterGoThrough() && leverStates.contains(down.getCondition())));
- r.getNodes().add(nodehere);
+ followWater = nodeHere.isWaterFilled(w) && (down == null || (down.canWaterGoThrough() && leverStates.contains(down.getCondition())));
+ r.getNodes().add(nodeHere);
if (down != null && down.canWaterGoThrough() && down.getCondition() != null && leverStates.contains(down.getCondition().invert())) {
waterBlockingStates.add(down.getCondition().invert());
}
@@ -250,16 +250,16 @@ public class WaterBoard {
followWater = getNodeAt(asd.getX() +1, asd.getY()) != null && leverStates.contains(getNodeAt(asd.getX() + 1, asd.getY()).getCondition())
&& getNodeAt(asd.getX() +2, asd.getY()) != null && leverStates.contains(getNodeAt(asd.getX() + 2, asd.getY()).getCondition());
for (int i = asd.getX(); i > asd.getX() - 8; i--) {
- WaterNode nodehere = getNodeAt(i, asd.getY());
- if (nodehere == null) break;
- if (followWater && !nodehere.isWaterFilled(w)) break;
- if (!nodehere.canWaterGoThrough()) break;
- if (!leverStates.contains(nodehere.getCondition()) && !nodehere.isWaterFilled(w)) break;
- if (nodehere.getCondition() != null && leverStates.contains(nodehere.getCondition().invert()) && nodehere.isWaterFilled(w)) waterBlockingStates.add(nodehere.getCondition().invert());
+ WaterNode nodeHere = getNodeAt(i, asd.getY());
+ if (nodeHere == null) break;
+ if (followWater && !nodeHere.isWaterFilled(w)) break;
+ if (!nodeHere.canWaterGoThrough()) break;
+ if (!leverStates.contains(nodeHere.getCondition()) && !nodeHere.isWaterFilled(w)) break;
+ if (nodeHere.getCondition() != null && leverStates.contains(nodeHere.getCondition().invert()) && nodeHere.isWaterFilled(w)) waterBlockingStates.add(nodeHere.getCondition().invert());
WaterNode down = getNodeAt(i, asd.getY() + 1);
if (i != asd.getX())
- followWater = nodehere.isWaterFilled(w) && (down == null || (down.canWaterGoThrough() && leverStates.contains(down.getCondition())));
- r.getNodes().add(nodehere);
+ followWater = nodeHere.isWaterFilled(w) && (down == null || (down.canWaterGoThrough() && leverStates.contains(down.getCondition())));
+ r.getNodes().add(nodeHere);
if (down != null && down.canWaterGoThrough() && down.getCondition() != null && leverStates.contains(down.getCondition().invert())) {
waterBlockingStates.add(down.getCondition().invert());
}
@@ -271,10 +271,10 @@ public class WaterBoard {
} else {
int minDistToDropRight = 9999;
for (int i = asd.getX(); i < asd.getX() + 8; i++) {
- WaterNode nodehere = getNodeAt(i, asd.getY());
- if (nodehere == null) break;
- if (!nodehere.canWaterGoThrough()) break;
- if (!leverStates.contains(nodehere.getCondition()) && !nodehere.isWaterFilled(w)) break;
+ WaterNode nodeHere = getNodeAt(i, asd.getY());
+ if (nodeHere == null) break;
+ if (!nodeHere.canWaterGoThrough()) break;
+ if (!leverStates.contains(nodeHere.getCondition()) && !nodeHere.isWaterFilled(w)) break;
WaterNode down = getNodeAt(i, asd.getY() + 1);
if (down != null && ((down.canWaterGoThrough() && leverStates.contains(down.getCondition())))) {
int dist = i - asd.getX();
@@ -285,10 +285,10 @@ public class WaterBoard {
}
int minDistToDropLeft = 9999;
for (int i = asd.getX(); i > asd.getX() - 8; i--) {
- WaterNode nodehere = getNodeAt(i, asd.getY());
- if (nodehere == null) break;
- if (!nodehere.canWaterGoThrough()) break;
- if (!leverStates.contains(nodehere.getCondition()) && !nodehere.isWaterFilled(w)) break;
+ WaterNode nodeHere = getNodeAt(i, asd.getY());
+ if (nodeHere == null) break;
+ if (!nodeHere.canWaterGoThrough()) break;
+ if (!leverStates.contains(nodeHere.getCondition()) && !nodeHere.isWaterFilled(w)) break;
WaterNode down = getNodeAt(i, asd.getY() + 1);
if (down != null && ((down.canWaterGoThrough() && leverStates.contains(down.getCondition())))) {
int dist = asd.getX() - i;
@@ -302,9 +302,9 @@ public class WaterBoard {
if (min == 9999) continue;
if (minDistToDropRight == min) {
for (int i = asd.getX(); i <= asd.getX() + minDistToDropRight; i++) {
- WaterNode nodehere = getNodeAt(i, asd.getY());
- if (nodehere.getCondition() != null && leverStates.contains(nodehere.getCondition().invert()) && nodehere.isWaterFilled(w)) waterBlockingStates.add(nodehere.getCondition().invert());
- r.getNodes().add(nodehere);
+ WaterNode nodeHere = getNodeAt(i, asd.getY());
+ if (nodeHere.getCondition() != null && leverStates.contains(nodeHere.getCondition().invert()) && nodeHere.isWaterFilled(w)) waterBlockingStates.add(nodeHere.getCondition().invert());
+ r.getNodes().add(nodeHere);
WaterNode down = getNodeAt(i, asd.getY() + 1);
if (down != null && ((down.canWaterGoThrough() && leverStates.contains(down.getCondition())) || down.isWaterFilled(w))) {
toGoDownTo.add(down);
@@ -316,9 +316,9 @@ public class WaterBoard {
}
if (minDistToDropLeft == min) {
for (int i = asd.getX(); i >= asd.getX() - minDistToDropLeft; i--) {
- WaterNode nodehere = getNodeAt(i, asd.getY());
- if (nodehere.getCondition() != null && leverStates.contains(nodehere.getCondition().invert()) && nodehere.isWaterFilled(w)) waterBlockingStates.add(nodehere.getCondition().invert());
- r.getNodes().add(nodehere);
+ WaterNode nodeHere = getNodeAt(i, asd.getY());
+ if (nodeHere.getCondition() != null && leverStates.contains(nodeHere.getCondition().invert()) && nodeHere.isWaterFilled(w)) waterBlockingStates.add(nodeHere.getCondition().invert());
+ r.getNodes().add(nodeHere);
WaterNode down = getNodeAt(i, asd.getY() + 1);
if (down != null && ((down.canWaterGoThrough() && leverStates.contains(down.getCondition())) || down.isWaterFilled(w))) {
toGoDownTo.add(down);
diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/events/annotations/EventHandlerRegistry.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/events/annotations/EventHandlerRegistry.java
index 0aede19f..b333ad79 100644
--- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/events/annotations/EventHandlerRegistry.java
+++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/events/annotations/EventHandlerRegistry.java
@@ -77,7 +77,7 @@ public class EventHandlerRegistry {
DGEventHandler dgEventHandler = declaredMethod.getAnnotation(DGEventHandler.class);
if (dgEventHandler == null) continue;
if (declaredMethod.getParameterTypes().length != 1)
- throw new RuntimeException("Too much or too less parameers: "+declaredMethod.getName()+" on "+clazz.getName());
+ throw new RuntimeException("Too many or too few parameters: "+declaredMethod.getName()+" on "+clazz.getName());
Class eventType = declaredMethod.getParameterTypes()[0];
if (!targets.containsKey(eventType)) targets.put(eventType, new LinkedList<>());
@@ -126,7 +126,7 @@ public class EventHandlerRegistry {
if (target.condition == null || (target.condition.get() == Boolean.TRUE)) // it is safe to use this here.
target.invokeSite.invoke(event);
} catch (Throwable e) {
- logger.error("An error occured while handling event: \nFeature = " + target.getFeature().getClass().getName(), e);
+ logger.error("An error occurred while handling event: \nFeature = " + target.getFeature().getClass().getName(), e);
}
profiler.endSection();
}
@@ -134,7 +134,7 @@ public class EventHandlerRegistry {
});
registeredHandlers.put(aClass, registered);
} catch (Exception e) {
- throw new RuntimeException("An error occured while registering listener for "+aClass.getName(), e);
+ throw new RuntimeException("An error occurred while registering listener for "+aClass.getName(), e);
}
}
}
diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/events/impl/BlockUpdateEvent.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/events/impl/BlockUpdateEvent.java
index 41b9cace..6c94541e 100644
--- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/events/impl/BlockUpdateEvent.java
+++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/events/impl/BlockUpdateEvent.java
@@ -32,6 +32,6 @@ public abstract class BlockUpdateEvent extends Event {
@Getter @Setter
private Set<Tuple<BlockPos, IBlockState>> updatedBlocks = new HashSet<>();
- public static class Pre extends BlockUpdateEvent {};
- public static class Post extends BlockUpdateEvent {};
+ public static class Pre extends BlockUpdateEvent {}
+ public static class Post extends BlockUpdateEvent {}
}
diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/events/listener/PacketInjector.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/events/listener/PacketInjector.java
index f3df018a..ff077148 100644
--- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/events/listener/PacketInjector.java
+++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/events/listener/PacketInjector.java
@@ -19,7 +19,8 @@
package kr.syeyoung.dungeonsguide.mod.events.listener;
import io.netty.channel.*;
-import kr.syeyoung.dungeonsguide.mod.events.impl.*;
+import kr.syeyoung.dungeonsguide.mod.events.impl.PlayerInteractEntityEvent;
+import kr.syeyoung.dungeonsguide.mod.events.impl.RawPacketReceivedEvent;
import net.minecraft.client.Minecraft;
import net.minecraft.network.Packet;
import net.minecraft.network.play.client.C02PacketUseEntity;
@@ -34,25 +35,25 @@ import java.util.Set;
@ChannelHandler.Sharable
public class PacketInjector extends ChannelDuplexHandler {
- private static Set<Class> targettedPackets = new HashSet<>();
+ private static Set<Class> targetedPackets = new HashSet<>();
static {
- targettedPackets.add(S04PacketEntityEquipment.class);
- targettedPackets.add(S45PacketTitle.class);
- targettedPackets.add(S38PacketPlayerListItem.class);
- targettedPackets.add(S30PacketWindowItems.class);
- targettedPackets.add(S2FPacketSetSlot.class);
- targettedPackets.add(S23PacketBlockChange.class);
- targettedPackets.add(S22PacketMultiBlockChange.class);
- targettedPackets.add(S3BPacketScoreboardObjective.class);
- targettedPackets.add(S3CPacketUpdateScore.class);
- targettedPackets.add(S3DPacketDisplayScoreboard.class);
- targettedPackets.add(S3EPacketTeams.class);
- targettedPackets.add(S34PacketMaps.class);
+ targetedPackets.add(S04PacketEntityEquipment.class);
+ targetedPackets.add(S45PacketTitle.class);
+ targetedPackets.add(S38PacketPlayerListItem.class);
+ targetedPackets.add(S30PacketWindowItems.class);
+ targetedPackets.add(S2FPacketSetSlot.class);
+ targetedPackets.add(S23PacketBlockChange.class);
+ targetedPackets.add(S22PacketMultiBlockChange.class);
+ targetedPackets.add(S3BPacketScoreboardObjective.class);
+ targetedPackets.add(S3CPacketUpdateScore.class);
+ targetedPackets.add(S3DPacketDisplayScoreboard.class);
+ targetedPackets.add(S3EPacketTeams.class);
+ targetedPackets.add(S34PacketMaps.class);
}
@Override
public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception {
Packet packet = (Packet) msg;
- if (targettedPackets.contains(msg.getClass())) {
+ if (targetedPackets.contains(msg.getClass())) {
RawPacketReceivedEvent receivedEvent = new RawPacketReceivedEvent(packet);
MinecraftForge.EVENT_BUS.post(receivedEvent);
packet = new WrappedPacket(receivedEvent.packet);
diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/FeatureRegistry.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/FeatureRegistry.java
index 2de83f5f..d98e8828 100644
--- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/FeatureRegistry.java
+++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/FeatureRegistry.java
@@ -119,7 +119,7 @@ public class FeatureRegistry {
public static FeatureDungeonMap DUNGEON_MAP;
- public static FeatureTestPepole TEST_PEPOLE;
+ public static FeatureTestPeople TEST_PEPOLE;
public static FeatureDungeonRoomName DUNGEON_ROOMNAME;
public static FeaturePressAnyKeyToCloseChest DUNGEON_CLOSECHEST;
public static FeatureBoxSkelemaster DUNGEON_BOXSKELEMASTER;
diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/advanced/FeatureDebugTrap.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/advanced/FeatureDebugTrap.java
index 738e97fd..f2da9a70 100644
--- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/advanced/FeatureDebugTrap.java
+++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/advanced/FeatureDebugTrap.java
@@ -62,7 +62,7 @@ public class FeatureDebugTrap extends TextHUDFeature {
}
- static long getAvgTimeItTookToPAcket(){
+ static long getAvgTimeItTookToPacket(){
return (long) avgStorage.stream().mapToLong(val -> val).average().orElse(0.0);
}
@@ -91,7 +91,7 @@ public class FeatureDebugTrap extends TextHUDFeature {
actualBit.add(new StyledText("Bats: ","base"));
- actualBit.add(new StyledText(String.valueOf(getAvgTimeItTookToPAcket()),"batsamm"));
+ actualBit.add(new StyledText(String.valueOf(getAvgTimeItTookToPacket()),"batsamm"));
return actualBit;
}
diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/advanced/FeatureTestPepole.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/advanced/FeatureTestPeople.java
index ab939091..40ddde89 100644
--- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/advanced/FeatureTestPepole.java
+++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/advanced/FeatureTestPeople.java
@@ -34,7 +34,6 @@ import kr.syeyoung.dungeonsguide.mod.utils.TextUtils;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.FontRenderer;
import net.minecraft.client.gui.Gui;
-import net.minecraft.client.network.NetworkPlayerInfo;
import net.minecraft.client.renderer.*;
import net.minecraft.client.renderer.texture.ITextureObject;
import net.minecraft.client.renderer.tileentity.TileEntitySkullRenderer;
@@ -45,7 +44,6 @@ import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagString;
-import net.minecraft.scoreboard.ScorePlayerTeam;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.client.event.ClientChatReceivedEvent;
@@ -63,15 +61,15 @@ import java.util.regex.Pattern;
import static kr.syeyoung.dungeonsguide.mod.utils.TabListUtil.getString;
-public class FeatureTestPepole extends RawRenderingGuiFeature {
+public class FeatureTestPeople extends RawRenderingGuiFeature {
- Logger logger = LogManager.getLogger("FeatureTestPepole");
+ Logger logger = LogManager.getLogger("FeatureTestPeople");
private Float scale;
- private Set<String> lastmebersRaw;
+ private Set<String> lastMembersRaw;
private boolean broadcastLock;
- public FeatureTestPepole() {
- super("Dungeon", "Feuture test", "NOU", "", false, 200, 100);
+ public FeatureTestPeople() {
+ super("Dungeon", "Feature test", "NOU", "", false, 200, 100);
addParameter("scale", new FeatureParameter<>("scale", "Scale", "Scale", 2.0f, "float", nval -> this.scale = nval));
@@ -83,11 +81,11 @@ public class FeatureTestPepole extends RawRenderingGuiFeature {
// }) ).start();
}
- public static void handlePartyBroadCast(String playload) {
- String[] messagge = playload.substring(2).split(":");
+ public static void handlePartyBroadCast(String payload) {
+ String[] message = payload.substring(2).split(":");
-// String random = messagge[1];
- String username = messagge[0];
+// String random = message[1];
+ String username = message[0];
System.out.println("Broadcast was a self broadcast with: " + username);
PartyManager.INSTANCE.getPartyContext().addDgUser(username);
@@ -97,11 +95,11 @@ public class FeatureTestPepole extends RawRenderingGuiFeature {
// .put("payload", actualPayload).toString()
// ));
-// } else if (playload.startsWith("ACK")){
-// String ACKnick = playload.substring(3);
+// } else if (payload.startsWith("ACK")){
+// String ACKnick = payload.substring(3);
// String[] nicks = ACKnick.split(":");
// if(Objects.equals(nicks[0], Minecraft.getMinecraft().getSession().getUsername())) {
-// FeatureTestPepole.addACK(new Tuple<String, String>(nicks[1], nicks[2]));
+// FeatureTestPeople.addACK(new Tuple<String, String>(nicks[1], nicks[2]));
// }
}
@@ -159,18 +157,18 @@ public class FeatureTestPepole extends RawRenderingGuiFeature {
if(PartyManager.INSTANCE.getPartyContext() == null) return;
- if(lastmebersRaw == null ) {
- lastmebersRaw = PartyManager.INSTANCE.getPartyContext().getPartyRawMembers();
+ if(lastMembersRaw == null ) {
+ lastMembersRaw = PartyManager.INSTANCE.getPartyContext().getPartyRawMembers();
return;
}
Set<String> membersRaw = PartyManager.INSTANCE.getPartyContext().getPartyRawMembers();
- if(!membersRaw.equals(lastmebersRaw)){
+ if(!membersRaw.equals(lastMembersRaw)){
logger.info("members changed unlocking locking broadcast");
broadcastLock = true;
broadcastYourself();
- lastmebersRaw = membersRaw;
+ lastMembersRaw = membersRaw;
}
}
@@ -195,7 +193,7 @@ public class FeatureTestPepole extends RawRenderingGuiFeature {
}
// this line should trick mineshaft to caching the player skin
- // im doing this bc just setting SkullOwner downloads the skin on main thread
+ // im doing this bc just setting SkullOwner downloads the skin on the main thread
// thus causing a lag spike
Map<MinecraftProfileTexture.Type, MinecraftProfileTexture> map = Minecraft.getMinecraft().getSkinManager().loadSkinFromCache(playerEntityByName.getGameProfile());
@@ -218,19 +216,19 @@ public class FeatureTestPepole extends RawRenderingGuiFeature {
private static final List<String> readyPhrase = Arrays.asList("r", "rdy", "ready");
private static final List<String> negator = Arrays.asList("not ", "not", "n", "n ");
- private static final Map<String, Boolean> readynessIndicator = new HashMap<>();
+ private static final Map<String, Boolean> readinessIndicator = new HashMap<>();
static {
- readyPhrase.forEach(val -> readynessIndicator.put(val, true));
+ readyPhrase.forEach(val -> readinessIndicator.put(val, true));
for (String s : negator) {
- readyPhrase.forEach(val -> readynessIndicator.put(s + val, false));
+ readyPhrase.forEach(val -> readinessIndicator.put(s + val, false));
}
- readynessIndicator.put("dont start", false);
- readynessIndicator.put("don't start", false);
- readynessIndicator.put("dont go", false);
- readynessIndicator.put("don't go", false);
- readynessIndicator.put("start", true);
- readynessIndicator.put("go", true);
+ readinessIndicator.put("dont start", false);
+ readinessIndicator.put("don't start", false);
+ readinessIndicator.put("dont go", false);
+ readinessIndicator.put("don't go", false);
+ readinessIndicator.put("start", true);
+ readinessIndicator.put("go", true);
}
@DGEventHandler()
@@ -241,9 +239,9 @@ public class FeatureTestPepole extends RawRenderingGuiFeature {
String chat = TextUtils.stripColor(txt.substring(txt.indexOf(":") + 1)).trim().toLowerCase();
- String usernamearea = TextUtils.stripColor(txt.substring(13, txt.indexOf(":")));
+ String usernameArea = TextUtils.stripColor(txt.substring(13, txt.indexOf(":")));
String username = null;
- for (String s : usernamearea.split(" ")) {
+ for (String s : usernameArea.split(" ")) {
if (s.isEmpty()) continue;
if (s.startsWith("[")) continue;
username = s;
@@ -252,7 +250,7 @@ public class FeatureTestPepole extends RawRenderingGuiFeature {
Boolean status = null;
String longestMatch = "";
- for (Map.Entry<String, Boolean> stringBooleanEntry : readynessIndicator.entrySet()) {
+ for (Map.Entry<String, Boolean> stringBooleanEntry : readinessIndicator.entrySet()) {
if (chat.startsWith(stringBooleanEntry.getKey()) || chat.endsWith(stringBooleanEntry.getKey()) || (stringBooleanEntry.getKey().length() >= 3 && chat.contains(stringBooleanEntry.getKey()))) {
if (stringBooleanEntry.getKey().length() > longestMatch.length()) {
longestMatch = stringBooleanEntry.getKey();
diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/boss/FeatureCurrentPhase.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/boss/FeatureCurrentPhase.java
index 72270752..dcfb715a 100644
--- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/boss/FeatureCurrentPhase.java
+++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/boss/FeatureCurrentPhase.java
@@ -64,11 +64,11 @@ public class FeatureCurrentPhase extends TextHUDFeature {
@Override
public List<StyledText> getText() {
- String currentPhsae = DungeonsGuide.getDungeonsGuide().getDungeonFacade().getContext().getBossfightProcessor().getCurrentPhase();
+ String currentPhase = DungeonsGuide.getDungeonsGuide().getDungeonFacade().getContext().getBossfightProcessor().getCurrentPhase();
List<StyledText> actualBit = new ArrayList<StyledText>();
actualBit.add(new StyledText("Current Phase","title"));
actualBit.add(new StyledText(": ","separator"));
- actualBit.add(new StyledText(currentPhsae,"phase"));
+ actualBit.add(new StyledText(currentPhase,"phase"));
return actualBit;
}
diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/boss/FeatureHideAnimals.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/boss/FeatureHideAnimals.java
index 425dcc69..06b7e39c 100644
--- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/boss/FeatureHideAnimals.java
+++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/boss/FeatureHideAnimals.java
@@ -32,7 +32,7 @@ import net.minecraftforge.client.event.RenderLivingEvent;
public class FeatureHideAnimals extends SimpleFeature {
public FeatureHideAnimals() {
super("Dungeon.Bossfight.Floor 4", "Hide animals on f4", "Hide Spirit Animals on F4. \nClick on Edit for precise setting", "bossfight.hideanimals", false);
- addParameter("sheep", new FeatureParameter<Boolean>("sheep", "Hide Sheeps", "Hide Sheeps", true, "boolean", nval -> sheep = nval));
+ addParameter("sheep", new FeatureParameter<Boolean>("sheep", "Hide Sheep", "Hide Sheep", true, "boolean", nval -> sheep = nval));
addParameter("cow", new FeatureParameter<Boolean>("cow", "Hide Cows", "Hide Cows", true, "boolean", nval -> cow = nval));
addParameter("chicken", new FeatureParameter<Boolean>("chicken", "Hide Chickens", "Hide Chickens", true, "boolean", nval -> chicken = nval));
addParameter("wolf", new FeatureParameter<Boolean>("wolf", "Hide Wolves", "Hide Wolves", true, "boolean", nval -> wolf = nval));
diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/boss/terminal/FeatureSimonSaysSolver.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/boss/terminal/FeatureSimonSaysSolver.java
index 9228d058..d5ef2706 100644
--- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/boss/terminal/FeatureSimonSaysSolver.java
+++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/boss/terminal/FeatureSimonSaysSolver.java
@@ -45,8 +45,8 @@ public class FeatureSimonSaysSolver extends SimpleFeature {
}
private final SkyblockStatus ss = DungeonsGuide.getDungeonsGuide().getSkyblockStatus();
- private final List<BlockPos> orderbuild = new ArrayList<BlockPos>();
- private final LinkedList<BlockPos> orderclick = new LinkedList<BlockPos>();
+ private final List<BlockPos> orderBuild = new ArrayList<BlockPos>();
+ private final LinkedList<BlockPos> orderClick = new LinkedList<BlockPos>();
@DGEventHandler
public void drawWorld(RenderWorldLastEvent event) {
@@ -60,10 +60,10 @@ public class FeatureSimonSaysSolver extends SimpleFeature {
if (Minecraft.getMinecraft().thePlayer.getPosition().distanceSq(309,123,291) > 400) return;
- if (orderclick.size() >= 1)
- RenderUtils.highlightBlock(orderclick.get(0), new Color(0, 255 ,255, 100), partialTicks, false);
- if (orderclick.size() >= 2)
- RenderUtils.highlightBlock(orderclick.get(1), new Color(255, 170, 0, 100), partialTicks, false);
+ if (orderClick.size() >= 1)
+ RenderUtils.highlightBlock(orderClick.get(0), new Color(0, 255 ,255, 100), partialTicks, false);
+ if (orderClick.size() >= 2)
+ RenderUtils.highlightBlock(orderClick.get(1), new Color(255, 170, 0, 100), partialTicks, false);
}
private boolean wasButton = false;
@DGEventHandler
@@ -76,19 +76,19 @@ public class FeatureSimonSaysSolver extends SimpleFeature {
if (!(dc.getBossfightProcessor() instanceof BossfightProcessorNecron)) return;
if (wasButton && DungeonsGuide.getDungeonsGuide().getBlockCache().getBlockState(new BlockPos(309, 123, 291)).getBlock() == Blocks.air) {
- orderclick.clear();
- orderbuild.clear();
+ orderClick.clear();
+ orderBuild.clear();
wasButton = false;
} else if (!wasButton && DungeonsGuide.getDungeonsGuide().getBlockCache().getBlockState(new BlockPos(309, 123, 291)).getBlock() == Blocks.stone_button){
- orderclick.addAll(orderbuild);
+ orderClick.addAll(orderBuild);
wasButton = true;
}
if (!wasButton) {
for (BlockPos allInBox : BlockPos.getAllInBox(new BlockPos(310, 123, 291), new BlockPos(310, 120, 294))) {
- if (DungeonsGuide.getDungeonsGuide().getBlockCache().getBlockState(allInBox).getBlock() == Blocks.sea_lantern && !orderbuild.contains(allInBox)) {
- orderbuild.add(allInBox);
+ if (DungeonsGuide.getDungeonsGuide().getBlockCache().getBlockState(allInBox).getBlock() == Blocks.sea_lantern && !orderBuild.contains(allInBox)) {
+ orderBuild.add(allInBox);
}
}
}
@@ -107,8 +107,8 @@ public class FeatureSimonSaysSolver extends SimpleFeature {
BlockPos pos = event.pos.add(1,0,0);
if (120 <= pos.getY() && pos.getY() <= 123 && pos.getX() == 310 && 291 <= pos.getZ() && pos.getZ() <= 294) {
if (DungeonsGuide.getDungeonsGuide().getBlockCache().getBlockState(event.pos).getBlock() != Blocks.stone_button) return;
- if (pos.equals(orderclick.peek())) {
- orderclick.poll();
+ if (pos.equals(orderClick.peek())) {
+ orderClick.poll();
}
}
}
diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/boss/terminal/FeatureTerminalSolvers.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/boss/terminal/FeatureTerminalSolvers.java
index 64c200ea..cef41a13 100644
--- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/boss/terminal/FeatureTerminalSolvers.java
+++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/boss/terminal/FeatureTerminalSolvers.java
@@ -39,14 +39,14 @@ import java.util.List;
public class FeatureTerminalSolvers extends SimpleFeature {
public FeatureTerminalSolvers() {
- super("Dungeon.Bossfight.Floor 7+","F7 GUI Terminal Solver", "Solve f7 gui terminals. (color, startswith, order, navigate, correct panes)", "bossfight.terminals");
+ super("Dungeon.Bossfight.Floor 7+","F7 GUI Terminal Solver", "Solve f7 gui terminals. (color, starts with, order, navigate, correct panes)", "bossfight.terminals");
}
public static final List<TerminalSolutionProvider> solutionProviders = new ArrayList<TerminalSolutionProvider>();
static {
solutionProviders.add(new WhatStartsWithSolutionProvider());
- solutionProviders.add(new SelectAllColorSolutionProivider());
+ solutionProviders.add(new SelectAllColorSolutionProvider());
solutionProviders.add(new SelectInOrderSolutionProvider());
solutionProviders.add(new NavigateMazeSolutionProvider());
solutionProviders.add(new CorrectThePaneSolutionProvider());
diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/boss/terminal/SelectAllColorSolutionProivider.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/boss/terminal/SelectAllColorSolutionProvider.java
index 3a6c20e0..cae3740d 100644
--- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/boss/terminal/SelectAllColorSolutionProivider.java
+++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/boss/terminal/SelectAllColorSolutionProvider.java
@@ -26,7 +26,7 @@ import net.minecraft.item.EnumDyeColor;
import java.util.ArrayList;
import java.util.List;
-public class SelectAllColorSolutionProivider implements TerminalSolutionProvider {
+public class SelectAllColorSolutionProvider implements TerminalSolutionProvider {
@Override
public TerminalSolution provideSolution(ContainerChest chest, List<Slot> clicked) {
TerminalSolution ts = new TerminalSolution();
diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/dungeon/FeatureDungeonCurrentRoomSecrets.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/dungeon/FeatureDungeonCurrentRoomSecrets.java
index c343c4a8..257f571b 100644
--- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/dungeon/FeatureDungeonCurrentRoomSecrets.java
+++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/dungeon/FeatureDungeonCurrentRoomSecrets.java
@@ -94,13 +94,13 @@ public class FeatureDungeonCurrentRoomSecrets extends TextHUDFeature {
int secretsIndex = text.indexOf("Secrets");
if (secretsIndex != -1) {
- int theindex = 0;
+ int theIndex = 0;
for (int i = secretsIndex; i >= 0; i--) {
if (text.startsWith("§7", i)) {
- theindex = i;
+ theIndex = i;
}
}
- String it = text.substring(theindex + 2, secretsIndex - 1);
+ String it = text.substring(theIndex + 2, secretsIndex - 1);
latestCurrSecrets = Integer.parseInt(it.split("/")[0]);
latestTotalSecrets = Integer.parseInt(it.split("/")[1]);
diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/dungeon/FeatureDungeonMap.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/dungeon/FeatureDungeonMap.java
index 5e662d2b..81462602 100644
--- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/dungeon/FeatureDungeonMap.java
+++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/dungeon/FeatureDungeonMap.java
@@ -99,9 +99,9 @@ public class FeatureDungeonMap extends RawRenderingGuiFeature {
}
public static final Ordering<NetworkPlayerInfo> sorter = Ordering.from((compare1, compare2) -> {
- ScorePlayerTeam scoreplayerteam = compare1.getPlayerTeam();
- ScorePlayerTeam scoreplayerteam1 = compare2.getPlayerTeam();
- return ComparisonChain.start().compareTrueFirst(compare1.getGameType() != WorldSettings.GameType.SPECTATOR, compare2.getGameType() != WorldSettings.GameType.SPECTATOR).compare(scoreplayerteam != null ? scoreplayerteam.getRegisteredName() : "", scoreplayerteam1 != null ? scoreplayerteam1.getRegisteredName() : "").compare(compare1.getGameProfile().getName(), compare2.getGameProfile().getName()).result();
+ ScorePlayerTeam scorePlayerTeam = compare1.getPlayerTeam();
+ ScorePlayerTeam scorePlayerTeam1 = compare2.getPlayerTeam();
+ return ComparisonChain.start().compareTrueFirst(compare1.getGameType() != WorldSettings.GameType.SPECTATOR, compare2.getGameType() != WorldSettings.GameType.SPECTATOR).compare(scorePlayerTeam != null ? scorePlayerTeam.getRegisteredName() : "", scorePlayerTeam1 != null ? scorePlayerTeam1.getRegisteredName() : "").compare(compare1.getGameProfile().getName(), compare2.getGameProfile().getName()).result();
});
private boolean on = false;
@@ -408,13 +408,13 @@ public class FeatureDungeonMap extends RawRenderingGuiFeature {
* @param scale Scale of the map
* @param postScale
* @param networkPlayerInfo
- * @param entityplayer
+ * @param entityPlayer
* @param pt2
* @param yaw2
*/
- private void drawHead(float scale, float postScale, TabListEntry networkPlayerInfo, EntityPlayer entityplayer, Vector2d pt2, float yaw2) {
+ private void drawHead(float scale, float postScale, TabListEntry networkPlayerInfo, EntityPlayer entityPlayer, Vector2d pt2, float yaw2) {
GlStateManager.pushMatrix();
- boolean flag1 = entityplayer != null && entityplayer.isWearing(EnumPlayerModelParts.CAPE);
+ boolean flag1 = entityPlayer != null && entityPlayer.isWearing(EnumPlayerModelParts.CAPE);
GlStateManager.enableTexture2D();
Minecraft.getMinecraft().getTextureManager().bindTexture(
networkPlayerInfo.getLocationSkin()
diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/dungeon/FeatureDungeonSecrets.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/dungeon/FeatureDungeonSecrets.java
index 53a415b6..5bc642ac 100644
--- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/dungeon/FeatureDungeonSecrets.java
+++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/dungeon/FeatureDungeonSecrets.java
@@ -33,7 +33,6 @@ import kr.syeyoung.dungeonsguide.mod.utils.TextUtils;
import java.util.ArrayList;
import java.util.Arrays;
-import java.util.Collections;
import java.util.List;
public class FeatureDungeonSecrets extends TextHUDFeature {
@@ -86,11 +85,11 @@ public class FeatureDungeonSecrets extends TextHUDFeature {
DungeonContext context = DungeonsGuide.getDungeonsGuide().getDungeonFacade().getContext();
if (context.getScaffoldParser() == null) return false;
if (context.getScaffoldParser().getUndiscoveredRoom() > 0) return false;
- boolean allknown = true;
+ boolean allKnown = true;
for (DungeonRoom dungeonRoom : context.getScaffoldParser().getDungeonRoomList()) {
- if (dungeonRoom.getTotalSecrets() == -1) allknown = false;
+ if (dungeonRoom.getTotalSecrets() == -1) allKnown = false;
}
- return allknown;
+ return allKnown;
}
public String getTotalSecrets() {
diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/etc/FeatureEpicCountdown.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/etc/FeatureEpicCountdown.java
index 77a38dd6..8ec39ca5 100644
--- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/etc/FeatureEpicCountdown.java
+++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/etc/FeatureEpicCountdown.java
@@ -53,10 +53,10 @@ public class FeatureEpicCountdown extends SimpleFeature {
}
@DGEventHandler
- public void procesSChat(ClientChatReceivedEvent receivedEvent) {
+ public void processChat(ClientChatReceivedEvent receivedEvent) {
String txt = receivedEvent.message.getFormattedText();
- // TODO: make a good chat remover with configurable chats, search chats recdeived and stuff, but not for now
+ // TODO: make a good chat remover with configurable chats, search chats recieved and stuff, but not for now
if(cleanChat){
if(txt.startsWith("§e[NPC] §bMort§f: §rTalk to me to change your class and ready up.§r")){
receivedEvent.setCanceled(true);
@@ -114,12 +114,12 @@ public class FeatureEpicCountdown extends SimpleFeature {
}
}
}
- long timepassed = System.currentTimeMillis() - updatedAt;
+ long timePassed = System.currentTimeMillis() - updatedAt;
- long secs = timepassed / 1000;
+ long secs = timePassed / 1000;
- int actualSecondspassed = (int) secs;
- actualSecondsLeft = secondsLeft - actualSecondspassed;
+ int actualSecondsPassed = (int) secs;
+ actualSecondsLeft = secondsLeft - actualSecondsPassed;
if (actualSecondsLeft <= 0) {
if(!Objects.equals(lastSec, GO_TEXT)){
lastSec = GO_TEXT;
diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/etc/FeaturePenguins.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/etc/FeaturePenguins.java
index dc68f133..8cca6653 100644
--- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/etc/FeaturePenguins.java
+++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/etc/FeaturePenguins.java
@@ -102,9 +102,9 @@ public class FeaturePenguins extends SimpleFeature {
GlStateManager.popMatrix();
- EntityPlayer entitylivingbaseIn = renderPlayerEvent.entityPlayer;
+ EntityPlayer entityPlayer = renderPlayerEvent.entityPlayer;
{
- ItemStack itemstack = entitylivingbaseIn.getHeldItem();
+ ItemStack itemstack = entityPlayer.getHeldItem();
if (itemstack != null)
{
@@ -119,7 +119,7 @@ public class FeaturePenguins extends SimpleFeature {
- if (entitylivingbaseIn.fishEntity != null)
+ if (entityPlayer.fishEntity != null)
{
itemstack = new ItemStack(Items.fishing_rod, 0);
}
@@ -152,7 +152,7 @@ public class FeaturePenguins extends SimpleFeature {
GlStateManager.scale(0.8,0.8,0.8);
- minecraft.getItemRenderer().renderItem(entitylivingbaseIn, itemstack, ItemCameraTransforms.TransformType.THIRD_PERSON);
+ minecraft.getItemRenderer().renderItem(entityPlayer, itemstack, ItemCameraTransforms.TransformType.THIRD_PERSON);
GlStateManager.popMatrix();
}
}
diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/party/customgui/FeatureCustomPartyFinder.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/party/customgui/FeatureCustomPartyFinder.java
index 94b0acc3..492a67df 100644
--- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/party/customgui/FeatureCustomPartyFinder.java
+++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/party/customgui/FeatureCustomPartyFinder.java
@@ -94,13 +94,13 @@ public class FeatureCustomPartyFinder extends SimpleFeature {
NBTTagCompound stackTagCompound = item.getTagCompound();
if (stackTagCompound.hasKey("display", 10)) {
- NBTTagCompound nbttagcompound = stackTagCompound.getCompoundTag("display");
+ NBTTagCompound nbtTagCompound = stackTagCompound.getCompoundTag("display");
- if (nbttagcompound.getTagId("Lore") == 9) {
- NBTTagList nbttaglist1 = nbttagcompound.getTagList("Lore", 8);
+ if (nbtTagCompound.getTagId("Lore") == 9) {
+ NBTTagList nbtTagList1 = nbtTagCompound.getTagList("Lore", 8);
- for (int i = 0; i < nbttaglist1.tagCount(); i++) {
- String str = nbttaglist1.getStringTagAt(i);
+ for (int i = 0; i < nbtTagList1.tagCount(); i++) {
+ String str = nbtTagList1.getStringTagAt(i);
if (str.startsWith("§aCurrently Selected")) {
lastClass = str.substring(24);
}
diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/party/customgui/PanelPartyFinder.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/party/customgui/PanelPartyFinder.java
index 0314c9e2..0dc15904 100644
--- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/party/customgui/PanelPartyFinder.java
+++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/party/customgui/PanelPartyFinder.java
@@ -313,13 +313,13 @@ public class PanelPartyFinder extends MPanel {
public void extractPage(ItemStack itemStack) {
NBTTagCompound stackTagCompound = itemStack.getTagCompound();
if (stackTagCompound.hasKey("display", 10)) {
- NBTTagCompound nbttagcompound = stackTagCompound.getCompoundTag("display");
+ NBTTagCompound nbtTagCompound = stackTagCompound.getCompoundTag("display");
- if (nbttagcompound.getTagId("Lore") == 9) {
- NBTTagList nbttaglist1 = nbttagcompound.getTagList("Lore", 8);
+ if (nbtTagCompound.getTagId("Lore") == 9) {
+ NBTTagList nbtTagList1 = nbtTagCompound.getTagList("Lore", 8);
- for (int i = 0; i < nbttaglist1.tagCount(); i++) {
- String str = nbttaglist1.getStringTagAt(i);
+ for (int i = 0; i < nbtTagList1.tagCount(); i++) {
+ String str = nbtTagList1.getStringTagAt(i);
if (str.startsWith("§ePage ")) {
int pg = Integer.parseInt(str.substring(7));
if (itemStack.getDisplayName().equals("§aPrevious Page")) page = pg+1;
@@ -337,6 +337,6 @@ public class PanelPartyFinder extends MPanel {
for (Map.Entry<Integer, PanelPartyListElement> value : panelPartyListElementMap.entrySet()) {
list.add(value.getValue());
}
- scrollablePanel.evalulateContentArea();
+ scrollablePanel.evaluateContentArea();
}
}
diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/party/customgui/PanelPartyFinderSettings.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/party/customgui/PanelPartyFinderSettings.java
index 2a509ef2..97538a60 100644
--- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/party/customgui/PanelPartyFinderSettings.java
+++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/party/customgui/PanelPartyFinderSettings.java
@@ -179,13 +179,13 @@ public class PanelPartyFinderSettings extends MPanelScaledGUI {
{
NBTTagCompound stackTagCompound = itemStack.getTagCompound();
if (stackTagCompound.hasKey("display", 10)) {
- NBTTagCompound nbttagcompound = stackTagCompound.getCompoundTag("display");
+ NBTTagCompound nbtTagCompound = stackTagCompound.getCompoundTag("display");
- if (nbttagcompound.getTagId("Lore") == 9) {
- NBTTagList nbttaglist1 = nbttagcompound.getTagList("Lore", 8);
+ if (nbtTagCompound.getTagId("Lore") == 9) {
+ NBTTagList nbtTagList1 = nbtTagCompound.getTagList("Lore", 8);
- for (int i = 0; i < nbttaglist1.tagCount(); i++) {
- String str = nbttaglist1.getStringTagAt(i);
+ for (int i = 0; i < nbtTagList1.tagCount(); i++) {
+ String str = nbtTagList1.getStringTagAt(i);
if (str.startsWith("§aDungeon: ")) {
dungeon = str.substring(11);
} else if (str.startsWith("§aFloor: ")) {
diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/party/customgui/PanelPartyListElement.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/party/customgui/PanelPartyListElement.java
index 154c5e8d..51c9fdaf 100644
--- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/party/customgui/PanelPartyListElement.java
+++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/party/customgui/PanelPartyListElement.java
@@ -77,11 +77,11 @@ public class PanelPartyListElement extends MPanel {
int color = RenderUtils.blendAlpha(0x141414, 0.0f);
String note = "";
- boolean notfound = false;
- boolean cantjoin = false;
+ boolean notFound = false;
+ boolean cantJoin = false;
if (itemStack.getItem() == Item.getItemFromBlock(Blocks.bedrock)) {
- cantjoin = true;
- notfound = true;
+ cantJoin = true;
+ notFound = true;
}
int minClass = -1, minDungeon = -1;
int pplIn = 0;
@@ -89,20 +89,20 @@ public class PanelPartyListElement extends MPanel {
{
NBTTagCompound stackTagCompound = itemStack.getTagCompound();
if (stackTagCompound.hasKey("display", 10)) {
- NBTTagCompound nbttagcompound = stackTagCompound.getCompoundTag("display");
+ NBTTagCompound nbtTagCompound = stackTagCompound.getCompoundTag("display");
- if (nbttagcompound.getTagId("Lore") == 9) {
- NBTTagList nbttaglist1 = nbttagcompound.getTagList("Lore", 8);
+ if (nbtTagCompound.getTagId("Lore") == 9) {
+ NBTTagList nbtTagList1 = nbtTagCompound.getTagList("Lore", 8);
- for (int i = 0; i < nbttaglist1.tagCount(); i++) {
- String str = nbttaglist1.getStringTagAt(i);
+ for (int i = 0; i < nbtTagList1.tagCount(); i++) {
+ String str = nbtTagList1.getStringTagAt(i);
if (str.startsWith("§7§7Note:")) {
note = str.substring(12);
} else if (str.startsWith("§7Class Level Required: §b")) {
minClass = Integer.parseInt(str.substring(26));
} else if (str.startsWith("§7Dungeon Level Required: §b")) {
minDungeon = Integer.parseInt(str.substring(28));
- } else if (str.startsWith("§cRequires ")) cantjoin = true;
+ } else if (str.startsWith("§cRequires ")) cantJoin = true;
if (str.endsWith("§b)")) pplIn ++;
if (str.startsWith(" ") && str.contains(":")) {
@@ -127,13 +127,13 @@ public class PanelPartyListElement extends MPanel {
}
} catch (Exception e) {}
- if (cantjoin) {}
+ if (cantJoin) {}
else if (clicked) {
color = RenderUtils.blendAlpha(0x141414, 0.10f);
} else if (lastAbsClip.contains(absMousex, absMousey) && (getTooltipsOpen() == 0 || (mTooltip != null && mTooltip.isOpen()))) {
color = RenderUtils.blendAlpha(0x141414, 0.12f);
}
- if (cantjoin) {}
+ if (cantJoin) {}
else if (note.contains("§e")) {
color = RenderUtils.blendTwoColors(color, 0x44FFFF00);
} else if (note.contains("§6")){
@@ -164,7 +164,7 @@ public class PanelPartyListElement extends MPanel {
name = name.substring(0, name.indexOf("'"));
fr.drawString(name, 0,0,-1);
- if (!notfound)
+ if (!notFound)
note = "§7("+pplIn+") §f"+note;
fr.drawString(note, fr.getStringWidth("AAAAAAAAAAAAAAAA")+5, 0,-1);
GlStateManager.popMatrix();
@@ -172,7 +172,7 @@ public class PanelPartyListElement extends MPanel {
String sideNote = "";
if (minClass != -1) sideNote += "§7CLv ≥§b"+minClass+" ";
if (minDungeon != -1) sideNote += "§7DLv ≥§b"+minDungeon+" ";
- if (cantjoin && !notfound) sideNote = "§cCan't join";
+ if (cantJoin && !notFound) sideNote = "§cCan't join";
sideNote = sideNote.trim();
GlStateManager.translate(getBounds().width,(32 - 2*fr.FONT_HEIGHT)/2,0);
diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/party/playerpreview/FeatureViewPlayerStatsOnJoin.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/party/playerpreview/FeatureViewPlayerStatsOnJoin.java
index 746f9728..c482337e 100644
--- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/party/playerpreview/FeatureViewPlayerStatsOnJoin.java
+++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/party/playerpreview/FeatureViewPlayerStatsOnJoin.java
@@ -55,8 +55,10 @@ import net.minecraftforge.fml.common.Loader;
import org.jetbrains.annotations.NotNull;
import org.lwjgl.input.Mouse;
+import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
-import java.util.*;
+import java.util.UUID;
// TODO: do not limit element positioning
// maybe a cool editor?
@@ -138,7 +140,7 @@ public class FeatureViewPlayerStatsOnJoin extends SimpleFeature {
int mouseY = (Minecraft.getMinecraft().displayHeight - Mouse.getY());
double width = 220 * scaledResolution.getScaleFactor();
- double heigth = 220 * scaledResolution.getScaleFactor();
+ double height = 220 * scaledResolution.getScaleFactor();
widget = new OverlayWidget(
new WidgetProfileViewer(gameProfile, FeatureRegistry.PARTYKICKER_APIKEY.getAPIKey(),
scaledResolution.getScaleFactor(), () -> {
@@ -148,7 +150,7 @@ public class FeatureViewPlayerStatsOnJoin extends SimpleFeature {
}
}),
OverlayType.OVER_CHAT,
- () -> new Rect(mouseX, mouseY-heigth, width, heigth)
+ () -> new Rect(mouseX, mouseY-height, width, height)
);
OverlayManager.getInstance().addOverlay(widget);
}
diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/party/playerpreview/api/ApiFetcher.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/party/playerpreview/api/ApiFetcher.java
index 36c59fe9..397161ec 100644
--- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/party/playerpreview/api/ApiFetcher.java
+++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/party/playerpreview/api/ApiFetcher.java
@@ -80,8 +80,8 @@ public class ApiFetcher {
connection.setConnectTimeout(10000);
connection.setReadTimeout(10000);
InputStreamReader inputStreamReader = new InputStreamReader(connection.getInputStream());
- String serverres = IOUtils.toString(inputStreamReader);
- return gson.fromJson(serverres, JsonObject.class);
+ String servers = IOUtils.toString(inputStreamReader);
+ return gson.fromJson(servers, JsonObject.class);
}
public static JsonArray getJsonArr(String url) throws IOException {
@@ -263,9 +263,9 @@ public class ApiFetcher {
public static Optional<Integer> getNumberOfSecretsFromAchievement(String uid, String apiKey) throws IOException {
- JsonObject responce = getJson("https://api.hypixel.net/player?uuid=" + uid + "&key=" + apiKey);
- if (responce.has("player")) {
- JsonObject treasures = responce.getAsJsonObject("player");
+ JsonObject response = getJson("https://api.hypixel.net/player?uuid=" + uid + "&key=" + apiKey);
+ if (response.has("player")) {
+ JsonObject treasures = response.getAsJsonObject("player");
if (treasures.has("achievements")) {
treasures = treasures.getAsJsonObject("achievements");
if (treasures.has("skyblock_treasure_hunter")) {
@@ -289,7 +289,7 @@ public class ApiFetcher {
}
public static Optional<PlayerSkyblockData> fetchPlayerProfiles(String uid, String apiKey) throws IOException {
- System.out.println("Featching player profiles");
+ System.out.println("Fetching player profiles");
JsonObject json = getJson("https://api.hypixel.net/skyblock/profiles?uuid=" + uid + "&key=" + apiKey);
if (!json.get("success").getAsBoolean()) return Optional.empty();
System.out.println("Downloaded data from api");
@@ -301,7 +301,7 @@ public class ApiFetcher {
ArrayList<PlayerProfile> playerProfiles = new ArrayList<>();
System.out.println("Saving and parsing data");
float lastSave = Long.MIN_VALUE;
- PlayerProfile lastest = null;
+ PlayerProfile latest = null;
for (JsonElement jsonElement : profiles) {
JsonObject semiProfile = jsonElement.getAsJsonObject();
if (!semiProfile.get("members").getAsJsonObject().has(dashTrimmed)) {
@@ -315,17 +315,17 @@ public class ApiFetcher {
System.out.println("Finished Parsing Profile");
- System.out.println("Getting nm of secrets from achivment");
+ System.out.println("Getting nm of secrets from achievement");
getNumberOfSecretsFromAchievement(uid, apiKey).ifPresent(e::setTotalSecrets);
- System.out.println("finished getting secrets from achivment");
+ System.out.println("finished getting secrets from achievement");
- System.out.println("Gettign last save");
+ System.out.println("Getting last save");
JsonElement last_save = semiProfile.get("last_save");
if(last_save != null){
float lastSave2 = last_save.getAsLong();
if (lastSave2 > lastSave) {
- lastest = e;
+ latest = e;
lastSave = lastSave2;
}
}
@@ -333,9 +333,9 @@ public class ApiFetcher {
playerProfiles.add(e);
}
- System.out.println("THE AMMOUT OF PLAYER PROFILES: " + playerProfiles.size());
+ System.out.println("THE AMOUNT OF PLAYER PROFILES: " + playerProfiles.size());
PlayerProfile[] p = new PlayerProfile[playerProfiles.size()];
- pp.setLastestprofileArrayIndex(getArrayIndex(p, lastest));
+ pp.setLatestProfileArrayIndex(getArrayIndex(p, latest));
pp.setPlayerProfiles(playerProfiles.toArray(p));
return Optional.of(pp);
}
diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/party/playerpreview/api/PlayerSkyblockData.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/party/playerpreview/api/PlayerSkyblockData.java
index 5a70ed93..f65eb6fa 100644
--- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/party/playerpreview/api/PlayerSkyblockData.java
+++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/party/playerpreview/api/PlayerSkyblockData.java
@@ -24,5 +24,5 @@ import lombok.Data;
@Data
public class PlayerSkyblockData {
PlayerProfile[] playerProfiles;
- int lastestprofileArrayIndex;
+ int latestProfileArrayIndex;
}
diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/party/playerpreview/api/playerprofile/PlayerProfile.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/party/playerpreview/api/playerprofile/PlayerProfile.java
index 5ea0111d..b8de1836 100644
--- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/party/playerpreview/api/playerprofile/PlayerProfile.java
+++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/party/playerpreview/api/playerprofile/PlayerProfile.java
@@ -43,7 +43,7 @@ public class PlayerProfile {
private int selectedWardrobe = -1;
private ItemStack[] inventory;
- private ItemStack[] enderchest;
+ private ItemStack[] enderChest;
private ItemStack[] talismans;
private int totalSecrets;
diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/party/playerpreview/api/playerprofile/PlayerProfileParser.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/party/playerpreview/api/playerprofile/PlayerProfileParser.java
index e81ab076..6f53994c 100644
--- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/party/playerpreview/api/playerprofile/PlayerProfileParser.java
+++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/party/playerpreview/api/playerprofile/PlayerProfileParser.java
@@ -140,10 +140,10 @@ public class PlayerProfileParser {
if (playerData.has("ender_chest_contents")) {
NBTTagCompound armor = parseBase64NBT(playerData.getAsJsonObject("ender_chest_contents").get("data").getAsString());
NBTTagList array = armor.getTagList("i", 10);
- playerProfile.setEnderchest(new ItemStack[array.tagCount()]);
+ playerProfile.setEnderChest(new ItemStack[array.tagCount()]);
for (int i = 0; i < array.tagCount(); i++) {
NBTTagCompound item = array.getCompoundTagAt(i);
- playerProfile.getEnderchest()[i] = deserializeNBT(item);
+ playerProfile.getEnderChest()[i] = deserializeNBT(item);
}
}
if (playerData.has("talisman_bag")) {
diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/party/playerpreview/api/playerprofile/dataclasses/DungeonClass.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/party/playerpreview/api/playerprofile/dataclasses/DungeonClass.java
index da32a49b..656bd2b4 100644
--- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/party/playerpreview/api/playerprofile/dataclasses/DungeonClass.java
+++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/party/playerpreview/api/playerprofile/dataclasses/DungeonClass.java
@@ -31,7 +31,7 @@ public enum DungeonClass {
private final String jsonName;
- private final String familarName;
+ private final String familiarName;
private static final Map<String, DungeonClass> jsonNameToClazz = new HashMap<>();
static {
for (DungeonClass value : values()) {
diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/party/playerpreview/datarenders/DataRendererEditor.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/party/playerpreview/datarenders/DataRendererEditor.java
index 393136fa..efa61f06 100644
--- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/party/playerpreview/datarenders/DataRendererEditor.java
+++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/party/playerpreview/datarenders/DataRendererEditor.java
@@ -81,8 +81,8 @@ public class DataRendererEditor extends MPanel {
GlStateManager.translate(6+hamburgerWidth, 5+fr.FONT_HEIGHT+3, 0);
int culmutativeY = 0;
int relSelectedY = selectedY - (5+ fr.FONT_HEIGHT + 3);
- boolean drewit = false;
- for (String datarenderers : feature.<List<String>>getParameter("datarenderers").getValue()) {
+ boolean drewIt = false;
+ for (String dataRenderers : feature.<List<String>>getParameter("datarenderers").getValue()) {
if (0 <= selectedX && selectedX <= hamburgerWidth+11 && currentlySelected != null) {
IDataRenderer dataRenderer = DataRendererRegistry.getDataRenderer(currentlySelected);
@@ -90,7 +90,7 @@ public class DataRendererEditor extends MPanel {
if (dataRenderer == null) dim = new Dimension(0,fr.FONT_HEIGHT*2);
else dim = dataRenderer.getDimension();
- if (culmutativeY + dim.height > relSelectedY && relSelectedY >= culmutativeY && !drewit) {
+ if (culmutativeY + dim.height > relSelectedY && relSelectedY >= culmutativeY && !drewIt) {
clip(scissor.x + 6 + hamburgerWidth, scissor.y + 5+fr.FONT_HEIGHT+3, baseWidth, 230);
GlStateManager.enableBlend();
GL14.glBlendFuncSeparate(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, GL11.GL_ONE, GL11.GL_ONE_MINUS_SRC_ALPHA);
@@ -112,11 +112,11 @@ public class DataRendererEditor extends MPanel {
GlStateManager.tryBlendFuncSeparate(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, GL11.GL_ONE, GL11.GL_ONE_MINUS_SRC_ALPHA);
fr.drawString("=",fr.getStringWidth("=")/2,(dim.height - fr.FONT_HEIGHT) / 2, 0xFFFFFFFF);
GlStateManager.translate(hamburgerWidth+1,dim.height,0);
- drewit = true;
+ drewIt = true;
}
}
- IDataRenderer dataRenderer = DataRendererRegistry.getDataRenderer(datarenderers);
+ IDataRenderer dataRenderer = DataRendererRegistry.getDataRenderer(dataRenderers);
clip(scissor.x + 6 + hamburgerWidth, scissor.y + 5+fr.FONT_HEIGHT+3, baseWidth, 230);
Dimension dim;
@@ -125,7 +125,7 @@ public class DataRendererEditor extends MPanel {
GlStateManager.tryBlendFuncSeparate(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, GL11.GL_ONE, GL11.GL_ONE_MINUS_SRC_ALPHA);
if (dataRenderer == null) {
fr.drawString("Couldn't find Datarenderer", 0,0, 0xFFFF0000);
- fr.drawString(datarenderers, 0,fr.FONT_HEIGHT, 0xFFFF0000);
+ fr.drawString(dataRenderers, 0,fr.FONT_HEIGHT, 0xFFFF0000);
dim = new Dimension(0, fr.FONT_HEIGHT * 2);
} else {
GlStateManager.pushMatrix();
@@ -144,7 +144,7 @@ public class DataRendererEditor extends MPanel {
culmutativeY += dim.height;
}
- if (currentlySelected != null && new Rectangle(0,5+fr.FONT_HEIGHT + 3, hamburgerWidth+11, 232).contains(selectedX, selectedY) && !drewit) {
+ if (currentlySelected != null && new Rectangle(0,5+fr.FONT_HEIGHT + 3, hamburgerWidth+11, 232).contains(selectedX, selectedY) && !drewIt) {
IDataRenderer dataRenderer = DataRendererRegistry.getDataRenderer(currentlySelected);
Dimension dim;
clip(scissor.x + 6 + hamburgerWidth, scissor.y + 5+fr.FONT_HEIGHT+3, baseWidth, 230);
@@ -246,7 +246,7 @@ public class DataRendererEditor extends MPanel {
Set<String> rest = new HashSet<>(DataRendererRegistry.getValidDataRenderer());
rest.removeAll( feature.<List<String>>getParameter("datarenderers").getValue());
rest.remove(currentlySelected);
- int culmutativeY = -scrollY;
+ int cumulativeY = -scrollY;
for (String datarenderers : rest) {
IDataRenderer dataRenderer = DataRendererRegistry.getDataRenderer(datarenderers);
Dimension dim;
@@ -257,12 +257,12 @@ public class DataRendererEditor extends MPanel {
dim = dataRenderer.getDimension();
GlStateManager.popMatrix();
}
- culmutativeY += dim.height;
+ cumulativeY += dim.height;
- if (legitRelY < culmutativeY) {
+ if (legitRelY < cumulativeY) {
currentlySelected = datarenderers;
selectedX = 155;
- selectedY = culmutativeY - dim.height + 5+fr.FONT_HEIGHT + 3;
+ selectedY = cumulativeY - dim.height + 5+fr.FONT_HEIGHT + 3;
break;
}
}
diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/party/playerpreview/datarenders/impl/DataRendererClassLv.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/party/playerpreview/datarenders/impl/DataRendererClassLv.java
index b76bcbf9..dedd2ceb 100644
--- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/party/playerpreview/datarenders/impl/DataRendererClassLv.java
+++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/party/playerpreview/datarenders/impl/DataRendererClassLv.java
@@ -44,16 +44,16 @@ public class DataRendererClassLv implements IDataRenderer {
ClassSpecificData<PlayerProfile.PlayerClassData> dungeonStatDungeonSpecificData = playerProfile.getPlayerClassData().get(dungeonClass);
boolean selected = playerProfile.getSelectedClass() == dungeonClass;
if (dungeonStatDungeonSpecificData == null) {
- fr.drawString(dungeonClass.getFamilarName(), 0,0, 0xFF55ffff);
- fr.drawString("Unknown", fr.getStringWidth(dungeonClass.getFamilarName()+" "),0,0xFFFFFFFF);
+ fr.drawString(dungeonClass.getFamiliarName(), 0,0, 0xFF55ffff);
+ fr.drawString("Unknown", fr.getStringWidth(dungeonClass.getFamiliarName()+" "),0,0xFFFFFFFF);
if (selected)
- fr.drawString("★", fr.getStringWidth(dungeonClass.getFamilarName()+" Unknown "),0,0xFFAAAAAA);
+ fr.drawString("★", fr.getStringWidth(dungeonClass.getFamiliarName()+" Unknown "),0,0xFFAAAAAA);
} else {
XPUtils.XPCalcResult xpCalcResult = XPUtils.getCataXp(dungeonStatDungeonSpecificData.getData().getExperience());
- fr.drawString(dungeonClass.getFamilarName(), 0,0, 0xFF55ffff);
- fr.drawString(xpCalcResult.getLevel()+"", fr.getStringWidth(dungeonClass.getFamilarName()+" "),0,0xFFFFFFFF);
+ fr.drawString(dungeonClass.getFamiliarName(), 0,0, 0xFF55ffff);
+ fr.drawString(xpCalcResult.getLevel()+"", fr.getStringWidth(dungeonClass.getFamiliarName()+" "),0,0xFFFFFFFF);
if (selected)
- fr.drawString("★", fr.getStringWidth(dungeonClass.getFamilarName()+" "+xpCalcResult.getLevel()+" "),0,0xFFAAAAAA);
+ fr.drawString("★", fr.getStringWidth(dungeonClass.getFamiliarName()+" "+xpCalcResult.getLevel()+" "),0,0xFFAAAAAA);
RenderUtils.renderBar(0, fr.FONT_HEIGHT, 100,xpCalcResult.getRemainingXp() == 0 ? 1 : (float) (xpCalcResult.getRemainingXp() / xpCalcResult.getNextLvXp()));
}
@@ -64,9 +64,9 @@ public class DataRendererClassLv implements IDataRenderer {
@Override
public Dimension renderDummy() {
FontRenderer fr = Minecraft.getMinecraft().fontRendererObj;
- fr.drawString(dungeonClass.getFamilarName(), 0,0, 0xFF55ffff);
- fr.drawString("99", fr.getStringWidth(dungeonClass.getFamilarName()+" "),0,0xFFFFFFFF);
- fr.drawString("★", fr.getStringWidth(dungeonClass.getFamilarName()+" 99 "),0,0xFFAAAAAA);
+ fr.drawString(dungeonClass.getFamiliarName(), 0,0, 0xFF55ffff);
+ fr.drawString("99", fr.getStringWidth(dungeonClass.getFamiliarName()+" "),0,0xFFFFFFFF);
+ fr.drawString("★", fr.getStringWidth(dungeonClass.getFamiliarName()+" 99 "),0,0xFFAAAAAA);
RenderUtils.renderBar(0, fr.FONT_HEIGHT, 100,1.0f);
return new Dimension(100, fr.FONT_HEIGHT*2);
}
diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/party/playerpreview/datarenders/impl/DataRendererSecrets.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/party/playerpreview/datarenders/impl/DataRendererSecrets.java
index f8c43a06..a99f884c 100644
--- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/party/playerpreview/datarenders/impl/DataRendererSecrets.java
+++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/party/playerpreview/datarenders/impl/DataRendererSecrets.java
@@ -30,10 +30,10 @@ public class DataRendererSecrets implements IDataRenderer {
@Override
public Dimension renderData(PlayerProfile playerProfile) {
FontRenderer fr = Minecraft.getMinecraft().fontRendererObj;
- double theint = playerProfile.getTotalSecrets()/ (double)playerProfile.getDungeonStats().values().stream().flatMap(s -> s.getData().getPlays().values().stream())
+ double theInt = playerProfile.getTotalSecrets()/ (double)playerProfile.getDungeonStats().values().stream().flatMap(s -> s.getData().getPlays().values().stream())
.map(fs -> fs.getData().getWatcherKills()).reduce(0, Integer::sum);
fr.drawString("§eSecrets §b"+playerProfile.getTotalSecrets()+" §7("+
- String.format("%.2f", theint)+"/run)", 0,0,-1);
+ String.format("%.2f", theInt)+"/run)", 0,0,-1);
return new Dimension(100, fr.FONT_HEIGHT);
}
diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/party/playerpreview/datarenders/impl/DataRendererSelectedClassLv.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/party/playerpreview/datarenders/impl/DataRendererSelectedClassLv.java
index 4d1d46e1..5dce0a30 100644
--- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/party/playerpreview/datarenders/impl/DataRendererSelectedClassLv.java
+++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/party/playerpreview/datarenders/impl/DataRendererSelectedClassLv.java
@@ -40,9 +40,9 @@ public class DataRendererSelectedClassLv implements IDataRenderer {
fr.drawString("Unknown Selected", 0,0, 0xFF55ffff);
} else {
XPUtils.XPCalcResult xpCalcResult = XPUtils.getCataXp(dungeonStatDungeonSpecificData.getData().getExperience());
- fr.drawString(playerProfile.getSelectedClass().getFamilarName(), 0,0, 0xFF55ffff);
- fr.drawString(xpCalcResult.getLevel()+"", fr.getStringWidth(playerProfile.getSelectedClass().getFamilarName()+" "),0,0xFFFFFFFF);
- fr.drawString("★", fr.getStringWidth(playerProfile.getSelectedClass().getFamilarName()+" "+xpCalcResult.getLevel()+" "),0,0xFFAAAAAA);
+ fr.drawString(playerProfile.getSelectedClass().getFamiliarName(), 0,0, 0xFF55ffff);
+ fr.drawString(xpCalcResult.getLevel()+"", fr.getStringWidth(playerProfile.getSelectedClass().getFamiliarName()+" "),0,0xFFFFFFFF);
+ fr.drawString("★", fr.getStringWidth(playerProfile.getSelectedClass().getFamiliarName()+" "+xpCalcResult.getLevel()+" "),0,0xFFAAAAAA);
RenderUtils.renderBar(0, fr.FONT_HEIGHT, 100,xpCalcResult.getRemainingXp() == 0 ? 1 : (float) (xpCalcResult.getRemainingXp() / xpCalcResult.getNextLvXp()));
}
diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/party/playerpreview/widget/WidgetPlayerModel.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/party/playerpreview/widget/WidgetPlayerModel.java
index 86eafaa7..d8068235 100644
--- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/party/playerpreview/widget/WidgetPlayerModel.java
+++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/party/playerpreview/widget/WidgetPlayerModel.java
@@ -19,41 +19,15 @@
package kr.syeyoung.dungeonsguide.mod.features.impl.party.playerpreview.widget;
import com.mojang.authlib.GameProfile;
-import kr.syeyoung.dungeonsguide.mod.DungeonsGuide;
-import kr.syeyoung.dungeonsguide.mod.cosmetics.ActiveCosmetic;
-import kr.syeyoung.dungeonsguide.mod.cosmetics.CosmeticData;
import kr.syeyoung.dungeonsguide.mod.features.impl.party.playerpreview.FakePlayer;
-import kr.syeyoung.dungeonsguide.mod.features.impl.party.playerpreview.api.ApiFetcher;
import kr.syeyoung.dungeonsguide.mod.features.impl.party.playerpreview.api.SkinFetcher;
import kr.syeyoung.dungeonsguide.mod.features.impl.party.playerpreview.api.playerprofile.PlayerProfile;
import kr.syeyoung.dungeonsguide.mod.guiv2.BindableAttribute;
-import kr.syeyoung.dungeonsguide.mod.guiv2.DomElement;
import kr.syeyoung.dungeonsguide.mod.guiv2.Widget;
-import kr.syeyoung.dungeonsguide.mod.guiv2.elements.MinecraftTooltip;
-import kr.syeyoung.dungeonsguide.mod.guiv2.elements.MouseTooltip;
-import kr.syeyoung.dungeonsguide.mod.guiv2.elements.PopupMgr;
-import kr.syeyoung.dungeonsguide.mod.guiv2.layouter.Layouter;
-import kr.syeyoung.dungeonsguide.mod.guiv2.primitive.ConstraintBox;
-import kr.syeyoung.dungeonsguide.mod.guiv2.primitive.Size;
-import kr.syeyoung.dungeonsguide.mod.guiv2.renderer.Renderer;
-import kr.syeyoung.dungeonsguide.mod.guiv2.renderer.RenderingContext;
-import kr.syeyoung.dungeonsguide.mod.guiv2.xml.AnnotatedExportOnlyWidget;
import kr.syeyoung.dungeonsguide.mod.guiv2.xml.AnnotatedWidget;
import kr.syeyoung.dungeonsguide.mod.guiv2.xml.annotations.Bind;
-import kr.syeyoung.dungeonsguide.mod.guiv2.xml.annotations.Export;
import kr.syeyoung.dungeonsguide.mod.guiv2.xml.annotations.On;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.FontRenderer;
-import net.minecraft.client.gui.inventory.GuiInventory;
-import net.minecraft.client.renderer.GlStateManager;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.EnumChatFormatting;
import net.minecraft.util.ResourceLocation;
-import org.lwjgl.opengl.GL11;
-import org.lwjgl.opengl.GL14;
-
-import java.util.Collections;
-import java.util.List;
public class WidgetPlayerModel extends AnnotatedWidget {
diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/party/playerpreview/widget/WidgetProfileViewerData.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/party/playerpreview/widget/WidgetProfileViewerData.java
index d984c34c..3ba7cbd0 100644
--- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/party/playerpreview/widget/WidgetProfileViewerData.java
+++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/party/playerpreview/widget/WidgetProfileViewerData.java
@@ -21,11 +21,9 @@ package kr.syeyoung.dungeonsguide.mod.features.impl.party.playerpreview.widget;
import com.mojang.authlib.GameProfile;
import kr.syeyoung.dungeonsguide.mod.chat.ChatProcessor;
import kr.syeyoung.dungeonsguide.mod.features.FeatureRegistry;
-import kr.syeyoung.dungeonsguide.mod.features.impl.party.playerpreview.api.ApiFetcher;
import kr.syeyoung.dungeonsguide.mod.features.impl.party.playerpreview.api.PlayerSkyblockData;
import kr.syeyoung.dungeonsguide.mod.features.impl.party.playerpreview.datarenders.DataRendererRegistry;
import kr.syeyoung.dungeonsguide.mod.features.impl.party.playerpreview.datarenders.IDataRenderer;
-import kr.syeyoung.dungeonsguide.mod.features.impl.secret.mechanicbrowser.WidgetStateTooltip;
import kr.syeyoung.dungeonsguide.mod.guiv2.BindableAttribute;
import kr.syeyoung.dungeonsguide.mod.guiv2.DomElement;
import kr.syeyoung.dungeonsguide.mod.guiv2.Widget;
@@ -34,17 +32,13 @@ import kr.syeyoung.dungeonsguide.mod.guiv2.elements.PopupMgr;
import kr.syeyoung.dungeonsguide.mod.guiv2.elements.Scaler;
import kr.syeyoung.dungeonsguide.mod.guiv2.primitive.Rect;
import kr.syeyoung.dungeonsguide.mod.guiv2.xml.AnnotatedWidget;
-import kr.syeyoung.dungeonsguide.mod.guiv2.xml.DomElementRegistry;
-import kr.syeyoung.dungeonsguide.mod.guiv2.xml.ExportedWidgetConverter;
import kr.syeyoung.dungeonsguide.mod.guiv2.xml.annotations.Bind;
import kr.syeyoung.dungeonsguide.mod.guiv2.xml.annotations.On;
import kr.syeyoung.dungeonsguide.mod.guiv2.xml.data.WidgetList;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.ScaledResolution;
-import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.util.ResourceLocation;
-import java.awt.*;
import java.util.ArrayList;
import java.util.List;
@@ -74,7 +68,7 @@ public class WidgetProfileViewerData extends AnnotatedWidget {
this.gameProfile = gameProfile;
playerModel.setValue(widgetPlayerModel = new WidgetPlayerModel(gameProfile, playerSkyblockData.getPlayerProfiles()
- [idx = playerSkyblockData.getLastestprofileArrayIndex()]));
+ [idx = playerSkyblockData.getLatestProfileArrayIndex()]));
List<String> stuff = FeatureRegistry.PARTYKICKER_VIEWPLAYER.<List<String>>getParameter("datarenderers").getValue();
for (String datarenderer : stuff) {
diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/solvers/FeatureSolverBlaze.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/solvers/FeatureSolverBlaze.java
index b755b94b..9c1626a3 100644
--- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/solvers/FeatureSolverBlaze.java
+++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/features/impl/solvers/FeatureSolverBlaze.java
@@ -28,13 +28,13 @@ public class FeatureSolverBlaze extends SimpleFeature {
addParameter("normBlazeColor", new FeatureParameter<AColor>("blazecolor", "Normal Blaze Color", "Normal Blaze Color", new AColor(255,255,255,255), "acolor", nval -> normBlazeColor = nval));
addParameter("nextBlazeColor", new FeatureParameter<AColor>("blazecolor", "Next Blaze Color", "Next Blaze Color", new AColor(0,255,0,255), "acolor", nval -> nextBlazeColor = nval));
addParameter("nextUpBlazeColor", new FeatureParameter<AColor>("blazecolor", "Next Up Blaze Color", "Color of blaze after next blaze", new AColor(255,255,0,255), "acolor", nval -> nextUpBlazeColor = nval));
- addParameter("blazeborder", new FeatureParameter<AColor>("blazeborder", "Blaze Border Color", "Blaze border color", new AColor(255,255,255,0), "acolor", nval -> blazeborder = nval));
+ addParameter("blazeborder", new FeatureParameter<AColor>("blazeborder", "Blaze Border Color", "Blaze border color", new AColor(255,255,255,0), "acolor", nval -> blazeBorder = nval));
}
AColor normBlazeColor;
AColor nextBlazeColor;
AColor nextUpBlazeColor;
- AColor blazeborder;
+ AColor blazeBorder;
public AColor getBlazeColor() {
return normBlazeColor;
@@ -46,6 +46,6 @@ public class FeatureSolverBlaze extends SimpleFeature {
return nextUpBlazeColor;
}
public AColor getBorder() {
- return blazeborder;
+ return blazeBorder;
}
}
diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/gui/MGui.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/gui/MGui.java
index ea43a6c1..fbceb1e5 100644
--- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/gui/MGui.java
+++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/gui/MGui.java
@@ -241,7 +241,7 @@ public class MGui extends GuiScreen {
@Override
public void handleInput() throws IOException {
-// Keyboard.enableRepeatEvents(true); // i hope it's temproary solution
+// Keyboard.enableRepeatEvents(true); // i hope it's a temporary solution
super.handleInput();
}
}
diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/gui/elements/MButton.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/gui/elements/MButton.java
index 1969b8b0..a961a323 100755
--- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/gui/elements/MButton.java
+++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/gui/elements/MButton.java
@@ -59,7 +59,7 @@ public class MButton extends MPanel {
if (!enabled) {
bg = disabled;
} else if (getTooltipsOpen() > 0) {
- } else if (isclicked) {
+ } else if (isClicked) {
bg = clicked;
} else if (new Rectangle(new Point(0,0),bounds).contains(relMousex0, relMousey0)) {
bg = hover;
@@ -91,11 +91,11 @@ public class MButton extends MPanel {
renderer.drawString(getText(), x,y, foreground.getRGB());
}
- boolean isclicked = false;
+ boolean isClicked = false;
@Override
public void mouseClicked(int absMouseX, int absMouseY, int relMouseX, int relMouseY, int mouseButton) {
if (lastAbsClip.contains(absMouseX, absMouseY) && getTooltipsOpen() == 0) {
- isclicked = true;
+ isClicked = true;
if (onActionPerformed != null)
onActionPerformed.run();
Minecraft.getMinecraft().getSoundHandler().playSound(PositionedSoundRecord.create(new ResourceLocation("gui.button.press"), 1.0F));
@@ -104,7 +104,7 @@ public class MButton extends MPanel {
@Override
public void mouseReleased(int absMouseX, int absMouseY, int relMouseX, int relMouseY, int state) {
- isclicked = false;
+ isClicked = false;
}
diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/gui/elements/MCollapsable.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/gui/elements/MCollapsable.java
index f665ee15..f51de0fa 100644
--- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/gui/elements/MCollapsable.java
+++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/gui/elements/MCollapsable.java
@@ -44,16 +44,16 @@ public class MCollapsable extends MPanel {
@Getter @Setter
private int leftPad = 0, leftPadElements = 13;
- private Runnable onPreferedSizeChange;
+ private Runnable onPreferredSizeChange;
- public MCollapsable(MPanel representing, Runnable onPreferedSizeChange) {
+ public MCollapsable(MPanel representing, Runnable onPreferredSizeChange) {
this.representing = representing;
super.add(representing);
lowerElements = new MList();
lowerElements.setGap(0);
super.add(lowerElements);
- this.onPreferedSizeChange = onPreferedSizeChange;
+ this.onPreferredSizeChange = onPreferredSizeChange;
}
@Override
@@ -112,20 +112,20 @@ public class MCollapsable extends MPanel {
@Override
public void add(MPanel child) {
lowerElements.add(child);
- if (onPreferedSizeChange != null) onPreferedSizeChange.run();
+ if (onPreferredSizeChange != null) onPreferredSizeChange.run();
}
@Override
public void remove(MPanel panel) {
lowerElements.remove(panel);
- if (onPreferedSizeChange != null) onPreferedSizeChange.run();
+ if (onPreferredSizeChange != null) onPreferredSizeChange.run();
}
@Override
public void mouseClicked(int absMouseX, int absMouseY, int relMouseX, int relMouseY, int mouseButton) {
if (relMouseX >= leftPad && relMouseY >= 0 && relMouseX <= leftPad + 10 && relMouseY <= representing.getPreferredSize().height) {
collapsed = !collapsed;
- if (onPreferedSizeChange != null) onPreferedSizeChange.run();
+ if (onPreferredSizeChange != null) onPreferredSizeChange.run();
}
}
diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/gui/elements/MList.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/gui/elements/MList.java
index bfdcae26..599c3fac 100644
--- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/gui/elements/MList.java
+++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/gui/elements/MList.java
@@ -43,8 +43,8 @@ public class MList extends MPanel {
public void realignChildren() {
int y = 0;
for (MPanel childComponent : getChildComponents()) {
- Dimension preferedSize = childComponent.getPreferredSize();
- int height = Math.max(10, preferedSize.height);
+ Dimension preferredSize = childComponent.getPreferredSize();
+ int height = Math.max(10, preferredSize.height);
childComponent.setBounds(new Rectangle(0, y, bounds.width, height));
y += height;
if (gap > 0)
@@ -58,9 +58,9 @@ public class MList extends MPanel {
int maxW = 0;
int h = 0;
for (MPanel childComponent : getChildComponents()) {
- Dimension preferedSize = childComponent.getPreferredSize();
- int height = Math.max(10, preferedSize.height);
- if (preferedSize.width > maxW) maxW = preferedSize.width;
+ Dimension preferredSize = childComponent.getPreferredSize();
+ int height = Math.max(10, preferredSize.height);
+ if (preferredSize.width > maxW) maxW = preferredSize.width;
h += height;
if (gap > 0) h += gap;
}
diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/gui/elements/MPortableColorEdit.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/gui/elements/MPortableColorEdit.java
index 051428a2..e3fa45ce 100644
--- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/gui/elements/MPortableColorEdit.java
+++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/gui/elements/MPortableColorEdit.java
@@ -93,7 +93,7 @@ public class MPortableColorEdit extends MTooltip {
int width = size.height- 35;
Tessellator tessellator = Tessellator.getInstance();
WorldRenderer worldrenderer = tessellator.getWorldRenderer();
- int shademodel = GL11.glGetInteger(GL11.GL_SHADE_MODEL);
+ int shadeModel = GL11.glGetInteger(GL11.GL_SHADE_MODEL);
GlStateManager.shadeModel(GL11.GL_SMOOTH);
GlStateManager.enableBlend();
GlStateManager.disableDepth();
@@ -163,7 +163,7 @@ public class MPortableColorEdit extends MTooltip {
GL11.glVertex3f(MathHelper.sin(rad) * radius + cx, MathHelper.cos(rad) * radius + cy, 0);
}
GL11.glEnd();
- GlStateManager.shadeModel(shademodel);
+ GlStateManager.shadeModel(shadeModel);
GlStateManager.color(1,1,1,1);
worldrenderer.begin(GL11.GL_LINE_LOOP, DefaultVertexFormats.POSITION);
diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/gui/elements/MScrollablePanel.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/gui/elements/MScrollablePanel.java
index c791d7a2..3f0a2dd8 100644
--- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/gui/elements/MScrollablePanel.java
+++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/gui/elements/MScrollablePanel.java
@@ -63,13 +63,13 @@ public class MScrollablePanel extends MPanel {
@Override
public void add(MPanel child) {
super.add(child);
- evalulateContentArea();
+ evaluateContentArea();
}
@Override
public void remove(MPanel panel) {
super.remove(panel);
- evalulateContentArea();
+ evaluateContentArea();
}
@Override
@@ -88,12 +88,12 @@ public class MScrollablePanel extends MPanel {
for (MPanel childComponent : childComponents) {
childComponent.resize0(parentWidth, parentHeight);
}
- evalulateContentArea();
+ evaluateContentArea();
}
};
viewPort.add(contentArea);
contentArea.setIgnoreBoundOnClip(true);
- evalulateContentArea();
+ evaluateContentArea();
}
@Override
@@ -108,7 +108,7 @@ public class MScrollablePanel extends MPanel {
}
}
- public void evalulateContentArea() {
+ public void evaluateContentArea() {
if (contentArea.getChildComponents().size() == 0) {
contentAreaDim= new Rectangle(0,0,0,0);
return;
@@ -133,23 +133,23 @@ public class MScrollablePanel extends MPanel {
super.setBounds(bounds);
boolean hideX = (axis & 2) == 0, hideY = (axis & 1) == 0;
viewPort.setBounds(new Rectangle(0,0,bounds.width, bounds.height));
- evalulateContentArea();
+ evaluateContentArea();
if (bounds.width >= contentAreaDim.width && hideScrollBarWhenNotNecessary) hideX = true;
if (bounds.height >= contentAreaDim.height && hideScrollBarWhenNotNecessary) hideY = true;
if (!(hideX || hideY)) {
- Dimension preferedX = scrollBarX.getPreferredSize();
- Dimension preferedY = scrollBarY.getPreferredSize();
- scrollBarY.setBounds(new Rectangle(bounds.width - preferedY.width, 0, preferedY.width, bounds.height - preferedX.height));
- scrollBarX.setBounds(new Rectangle(0, bounds.height - preferedX.height, bounds.width - preferedY.width, preferedX.height));
+ Dimension preferredX = scrollBarX.getPreferredSize();
+ Dimension preferredY = scrollBarY.getPreferredSize();
+ scrollBarY.setBounds(new Rectangle(bounds.width - preferredY.width, 0, preferredY.width, bounds.height - preferredX.height));
+ scrollBarX.setBounds(new Rectangle(0, bounds.height - preferredX.height, bounds.width - preferredY.width, preferredX.height));
} else if ((hideY && !hideX)) {
- Dimension preferedX = scrollBarX.getPreferredSize();
+ Dimension preferredX = scrollBarX.getPreferredSize();
scrollBarY.setBounds(new Rectangle(0,0,0,0));
- scrollBarX.setBounds(new Rectangle(0, bounds.height - preferedX.height, bounds.width, preferedX.height));
+ scrollBarX.setBounds(new Rectangle(0, bounds.height - preferredX.height, bounds.width, preferredX.height));
} else if ((hideX && !hideY)) {
- Dimension preferedY = scrollBarY.getPreferredSize();
+ Dimension preferredY = scrollBarY.getPreferredSize();
scrollBarX.setBounds(new Rectangle(0,0,0,0));
- scrollBarY.setBounds(new Rectangle(bounds.width - preferedY.width, 0, preferedY.width, bounds.height));
+ scrollBarY.setBounds(new Rectangle(bounds.width - preferredY.width, 0, preferredY.width, bounds.height));
} else if (hideX && hideY){
scrollBarY.setBounds(new Rectangle(0,0,0,0));
scrollBarX.setBounds(new Rectangle(0,0,0,0));
@@ -161,7 +161,7 @@ public class MScrollablePanel extends MPanel {
scrollBarY.setThumbSize(viewPort.getBounds().height);
scrollBarX.setMax(contentAreaDim.x + contentAreaDim.width-scrollBarX.getThumbSize());
scrollBarY.setMax(contentAreaDim.y + contentAreaDim.height-scrollBarY.getThumbSize());
- evalulateContentArea();
+ evaluateContentArea();
}
diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/gui/elements/MTextField.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/gui/elements/MTextField.java
index eb77e728..84adfdb1 100755
--- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/gui/elements/MTextField.java
+++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/gui/elements/MTextField.java
@@ -45,7 +45,7 @@ public class MTextField extends MPanel {
private String text = "";
@Setter
private String placeHolder = "";
- private int cursorBlickTicker = 0;
+ private int cursorBlinkTicker = 0;
private int selectionStart = 0;
private int selectionEnd = 0;
@@ -117,10 +117,10 @@ public class MTextField extends MPanel {
if (cursor != -1) {
if (cursor > text.length()) setCursor0(text.length());
int x = fr.getStringWidth(text.substring(0, cursor)) - xOffset;
- cursorBlickTicker++;
- if (cursorBlickTicker < 10)
+ cursorBlinkTicker++;
+ if (cursorBlinkTicker < 10)
Gui.drawRect(3 + x, y, 4 + x, y + fr.FONT_HEIGHT, 0xFFFFFFFF);
- if (cursorBlickTicker == 20) cursorBlickTicker = 0;
+ if (cursorBlinkTicker == 20) cursorBlinkTicker = 0;
}
}
}
diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/guiv2/GuiScreenAdapter.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/guiv2/GuiScreenAdapter.java
index 2a5046b3..ffbd27df 100644
--- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/guiv2/GuiScreenAdapter.java
+++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/guiv2/GuiScreenAdapter.java
@@ -270,7 +270,7 @@ public class GuiScreenAdapter extends GuiScreen {
@Override
public void handleInput() throws IOException {
- Keyboard.enableRepeatEvents(true); // i hope it's temproary solution NEU Incompat. ?
+ Keyboard.enableRepeatEvents(true); // I hope it's a temporary solution NEU Incompat. ?
super.handleInput();
}
}
diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/guiv2/Widget.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/guiv2/Widget.java
index b26be753..351f9abd 100644
--- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/guiv2/Widget.java
+++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/guiv2/Widget.java
@@ -32,7 +32,7 @@ public abstract class Widget {
private DomElement domElement = new DomElement();
- private boolean multiatfirst = false;
+ private boolean multiAtFirst = false;
public DomElement createDomElement(DomElement parent) {
domElement = new DomElement();
domElement.setWidget(this);
diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/guiv2/elements/AspectRatioFitter.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/guiv2/elements/AspectRatioFitter.java
index acc21f75..f3a1054f 100644
--- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/guiv2/elements/AspectRatioFitter.java
+++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/guiv2/elements/AspectRatioFitter.java
@@ -76,7 +76,7 @@ public class AspectRatioFitter extends AnnotatedExportOnlyWidget implements Layo
return new Size(widthIfHeightFit, constraintBox.getMaxHeight());
} else {
- throw new IllegalStateException("How is this possible mathmatically?");
+ throw new IllegalStateException("How is this possible mathematically?");
}
}
diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/guiv2/elements/Border.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/guiv2/elements/Border.java
index 645fc0fc..02f14d6d 100644
--- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/guiv2/elements/Border.java
+++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/guiv2/elements/Border.java
@@ -47,7 +47,7 @@ public class Border extends AnnotatedExportOnlyWidget implements Layouter {
@Override
public Size layout(DomElement buildContext, ConstraintBox constraintBox) {
- // layout borders, ask them about their constraints
+ // layout borders, ask them about their constraints,
// then layout content with space less than blahblah
// then relayout borders.
DomElement top = null, bottom = null, left = null, right = null, content = null;
diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/guiv2/elements/image/ImageTexture.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/guiv2/elements/image/ImageTexture.java
index 0e794cc1..3ff23c7e 100644
--- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/guiv2/elements/image/ImageTexture.java
+++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/guiv2/elements/image/ImageTexture.java
@@ -164,7 +164,7 @@ public class ImageTexture {
callback.accept(imageTexture);
} catch (Exception e) {
callback.accept(null);
- logger.log(Level.WARN, "An error occured while loading image from: "+url, e);
+ logger.log(Level.WARN, "An error occurred while loading image from: "+url, e);
}
});
}
diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/guiv2/elements/image/URLImage.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/guiv2/elements/image/URLImage.java
index 13bc2bae..8905b370 100644
--- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/guiv2/elements/image/URLImage.java
+++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/guiv2/elements/image/URLImage.java
@@ -71,7 +71,7 @@ public class URLImage extends AnnotatedExportOnlyWidget implements Renderer, Lay
} else if (widthIfHeightFit <= constraintBox.getMaxWidth()){
return new Size(Layouter.clamp(widthIfHeightFit, constraintBox.getMinWidth(), constraintBox.getMaxWidth()), constraintBox.getMaxHeight());
} else {
- throw new IllegalStateException("How is this possible mathmatically?");
+ throw new IllegalStateException("How is this possible mathematically?");
}
}
diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/guiv2/elements/richtext/fonts/DefaultFontRenderer.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/guiv2/elements/richtext/fonts/DefaultFontRenderer.java
index ade7b519..7892217a 100644
--- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/guiv2/elements/richtext/fonts/DefaultFontRenderer.java
+++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/guiv2/elements/richtext/fonts/DefaultFontRenderer.java
@@ -244,8 +244,8 @@ public class DefaultFontRenderer implements FontRenderer {
i1 = 0;
for(int j1 = list.size(); i1 < j1; ++i1) {
- VertexFormatElement vertexformatelement1 = (VertexFormatElement)list.get(i1);
- vertexformatelement1.getUsage().postDraw(vertexformat, i1, i, bytebuffer);
+ VertexFormatElement vertexFormatElement1 = (VertexFormatElement)list.get(i1);
+ vertexFormatElement1.getUsage().postDraw(vertexformat, i1, i, bytebuffer);
}
}
diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/guiv2/xml/AnnotatedImportOnlyWidget.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/guiv2/xml/AnnotatedImportOnlyWidget.java
index 480dae73..3ba59697 100644
--- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/guiv2/xml/AnnotatedImportOnlyWidget.java
+++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/guiv2/xml/AnnotatedImportOnlyWidget.java
@@ -55,7 +55,7 @@ public abstract class AnnotatedImportOnlyWidget extends Widget implements Import
public final List<Widget> build(DomElement buildContext) {
try (Parser parser = DomElementRegistry.obtainParser(target)) {
ParserElement element = parser.getRootNode();
- ParsedWidgetConverter converter = DomElementRegistry.obtainConverter(element.getNodename());
+ ParsedWidgetConverter converter = DomElementRegistry.obtainConverter(element.getNodeName());
Widget w = converter.convert(this, element);
return Collections.singletonList(w);
} catch (IOException e) {
diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/guiv2/xml/AnnotatedWidget.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/guiv2/xml/AnnotatedWidget.java
index a758c859..a7eb0078 100644
--- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/guiv2/xml/AnnotatedWidget.java
+++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/guiv2/xml/AnnotatedWidget.java
@@ -58,16 +58,16 @@ public abstract class AnnotatedWidget extends Widget implements ImportingWidget,
public final List<Widget> build(DomElement buildContext) {
try (Parser parser = DomElementRegistry.obtainParser(target)) {
ParserElement element = parser.getRootNode();
- if (element.getNodename().equals("multi")) {
+ if (element.getNodeName().equals("multi")) {
List<Widget> widgets = new ArrayList<>();
for (ParserElement child : element.getChildren()) {
- ParsedWidgetConverter converter = DomElementRegistry.obtainConverter(child.getNodename());
+ ParsedWidgetConverter converter = DomElementRegistry.obtainConverter(child.getNodeName());
Widget w = converter.convert(this, child);
widgets.add(w);
}
return widgets;
} else {
- ParsedWidgetConverter converter = DomElementRegistry.obtainConverter(element.getNodename());
+ ParsedWidgetConverter converter = DomElementRegistry.obtainConverter(element.getNodeName());
Widget w = converter.convert(this, element);
return Collections.singletonList(w);
}
diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/guiv2/xml/DelegatingWidget.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/guiv2/xml/DelegatingWidget.java
index 9f5106bf..449f1d51 100644
--- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/guiv2/xml/DelegatingWidget.java
+++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/guiv2/xml/DelegatingWidget.java
@@ -40,10 +40,10 @@ public class DelegatingWidget extends Widget implements ExportedWidget, Importin
try (Parser parser = DomElementRegistry.obtainParser(location)) {
ParserElement element = parser.getRootNode();
- if (!element.getNodename().equals("wrapper")) throw new IllegalArgumentException("Delegating widget root element Must be wrapper");
+ if (!element.getNodeName().equals("wrapper")) throw new IllegalArgumentException("Delegating widget root element Must be wrapper");
List<Widget> widgets = new ArrayList<>();
for (ParserElement child : element.getChildren()) {
- ParsedWidgetConverter converter = DomElementRegistry.obtainConverter(child.getNodename());
+ ParsedWidgetConverter converter = DomElementRegistry.obtainConverter(child.getNodeName());
Widget w = converter.convert(this, child);
widgets.add(w);
}
diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/guiv2/xml/DomElementRegistry.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/guiv2/xml/DomElementRegistry.java
index cd745711..8bc9b5a2 100644
--- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/guiv2/xml/DomElementRegistry.java
+++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/guiv2/xml/DomElementRegistry.java
@@ -42,7 +42,7 @@ public class DomElementRegistry {
public static <T extends Widget, R extends Widget & ImportingWidget> ParsedWidgetConverter<T, R> obtainConverter(String name) {
if (!converters.containsKey(name))
- System.out.println("Try to get nonexistant widget "+name);
+ System.out.println("Try to get nonexistent widget "+name);
return converters.get(name);
}
@@ -91,7 +91,7 @@ public class DomElementRegistry {
IResource iResource = Minecraft.getMinecraft().getResourceManager().getResource(resourceLocation);
return new W3CBackedParser(iResource.getInputStream());
} catch (Exception e) {
- throw new ParserException("An error occured while parsing "+resourceLocation, e);
+ throw new ParserException("An error occurred while parsing "+resourceLocation, e);
}
}
}
diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/guiv2/xml/PropByPropParsedWidgetConverter.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/guiv2/xml/PropByPropParsedWidgetConverter.java
index aaa6889b..d0a907a2 100644
--- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/guiv2/xml/PropByPropParsedWidgetConverter.java
+++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/guiv2/xml/PropByPropParsedWidgetConverter.java
@@ -121,7 +121,7 @@ public abstract class PropByPropParsedWidgetConverter<W extends Widget, R extend
} else if (attribute.getType() == Widget.class) {
if (elements.size() > 1) throw new IllegalArgumentException("More than 1 for single widget: "+stringListEntry.getKey());
if (elements.size() == 1)
- attribute.setValue(DomElementRegistry.obtainConverter(elements.get(0).getNodename())
+ attribute.setValue(DomElementRegistry.obtainConverter(elements.get(0).getNodeName())
.convert(rootWidget, elements.get(0)));
else attribute.setValue(null);
} else if (attribute.getType() == ParserElementList.class) {
@@ -129,7 +129,7 @@ public abstract class PropByPropParsedWidgetConverter<W extends Widget, R extend
} else if (attribute.getType() == WidgetList.class) {
attribute.setValue(
elements.stream()
- .map(a -> DomElementRegistry.obtainConverter(a.getNodename()).convert(rootWidget, a))
+ .map(a -> DomElementRegistry.obtainConverter(a.getNodeName()).convert(rootWidget, a))
.collect(Collectors.toList()));
}
}
diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/guiv2/xml/data/ParserElement.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/guiv2/xml/data/ParserElement.java
index 328164ad..bae7628f 100644
--- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/guiv2/xml/data/ParserElement.java
+++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/guiv2/xml/data/ParserElement.java
@@ -22,7 +22,7 @@ import java.util.List;
import java.util.Set;
public interface ParserElement {
- String getNodename();
+ String getNodeName();
String getAttributeValue(String attribute);
diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/guiv2/xml/data/W3CBackedParserElement.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/guiv2/xml/data/W3CBackedParserElement.java
index 043ea8bf..78e755e6 100644
--- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/guiv2/xml/data/W3CBackedParserElement.java
+++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/guiv2/xml/data/W3CBackedParserElement.java
@@ -34,7 +34,7 @@ public class W3CBackedParserElement implements ParserElement {
}
@Override
- public String getNodename() {
+ public String getNodeName() {
return backingElement.getTagName();
}
diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/parallelUniverse/tab/TabList.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/parallelUniverse/tab/TabList.java
index bcda9c6c..c3776f52 100644
--- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/parallelUniverse/tab/TabList.java
+++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/parallelUniverse/tab/TabList.java
@@ -22,10 +22,8 @@ import com.google.common.collect.BiMap;
import com.google.common.collect.ComparisonChain;
import com.google.common.collect.HashBiMap;
import com.google.common.collect.Ordering;
-import kr.syeyoung.dungeonsguide.mod.parallelUniverse.scoreboard.Score;
import kr.syeyoung.dungeonsguide.mod.parallelUniverse.teams.Team;
import kr.syeyoung.dungeonsguide.mod.parallelUniverse.teams.TeamManager;
-import net.minecraft.scoreboard.ScorePlayerTeam;
import net.minecraft.world.WorldSettings;
import java.util.*;
@@ -34,13 +32,13 @@ public class TabList {
public static final TabList INSTANCE = new TabList();
private final SortedSet<TabListEntry> tabListEntries = new TreeSet<>(Ordering.from((compare1, compare2) -> {
- Team scoreplayerteam = TeamManager.INSTANCE.getPlayerTeam(compare1.getGameProfile().getName());
- Team scoreplayerteam1 = TeamManager.INSTANCE.getPlayerTeam(compare2.getGameProfile().getName());
+ Team scorePlayerTeam = TeamManager.INSTANCE.getPlayerTeam(compare1.getGameProfile().getName());
+ Team scorePlayerTeam1 = TeamManager.INSTANCE.getPlayerTeam(compare2.getGameProfile().getName());
return ComparisonChain.start()
- .compareTrueFirst(compare1.getGamemode() != WorldSettings.GameType.SPECTATOR,
- compare2.getGamemode() != WorldSettings.GameType.SPECTATOR)
- .compare(scoreplayerteam != null ? scoreplayerteam.getTeamName() : "",
- scoreplayerteam1 != null ? scoreplayerteam1.getTeamName() : "")
+ .compareTrueFirst(compare1.getGameMode() != WorldSettings.GameType.SPECTATOR,
+ compare2.getGameMode() != WorldSettings.GameType.SPECTATOR)
+ .compare(scorePlayerTeam != null ? scorePlayerTeam.getTeamName() : "",
+ scorePlayerTeam1 != null ? scorePlayerTeam1.getTeamName() : "")
.compare(compare1.getGameProfile().getName(), compare2.getGameProfile().getName()).result();
}));
private final Map<UUID, TabListEntry> registered = new HashMap<>();
diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/parallelUniverse/tab/TabListEntry.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/parallelUniverse/tab/TabListEntry.java
index adea8511..a0c6a84e 100644
--- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/parallelUniverse/tab/TabListEntry.java
+++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/parallelUniverse/tab/TabListEntry.java
@@ -27,23 +27,19 @@ import lombok.Getter;
import lombok.RequiredArgsConstructor;
import lombok.Setter;
import net.minecraft.client.Minecraft;
-import net.minecraft.client.network.NetworkPlayerInfo;
import net.minecraft.client.resources.DefaultPlayerSkin;
import net.minecraft.client.resources.SkinManager;
-import net.minecraft.scoreboard.ScorePlayerTeam;
import net.minecraft.util.IChatComponent;
import net.minecraft.util.ResourceLocation;
import net.minecraft.world.WorldSettings.GameType;
-import java.util.UUID;
-
@RequiredArgsConstructor
public class TabListEntry {
@Getter
private final GameProfile gameProfile;
// properties?
@Getter @Setter
- private final GameType gamemode;
+ private final GameType gameMode;
@Getter @Setter
private int ping;
@Getter
diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/party/PartyManager.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/party/PartyManager.java
index 69515e94..3a5d1f58 100644
--- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/party/PartyManager.java
+++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/party/PartyManager.java
@@ -24,7 +24,7 @@ import kr.syeyoung.dungeonsguide.mod.chat.ChatSubscriber;
import kr.syeyoung.dungeonsguide.mod.chat.ChatTransmitter;
import kr.syeyoung.dungeonsguide.mod.events.impl.HypixelJoinedEvent;
import kr.syeyoung.dungeonsguide.mod.events.impl.StompConnectedEvent;
-import kr.syeyoung.dungeonsguide.mod.features.impl.advanced.FeatureTestPepole;
+import kr.syeyoung.dungeonsguide.mod.features.impl.advanced.FeatureTestPeople;
import kr.syeyoung.dungeonsguide.mod.stomp.StompHeader;
import kr.syeyoung.dungeonsguide.mod.stomp.StompManager;
import kr.syeyoung.dungeonsguide.mod.stomp.StompPayload;
@@ -566,7 +566,7 @@ public class PartyManager {
String broadCastPlayload = new JSONObject(payload).getString("payload");
System.out.println("Received broadcast");
if(broadCastPlayload.startsWith("C:")) {
- FeatureTestPepole.handlePartyBroadCast(broadCastPlayload);
+ FeatureTestPeople.handlePartyBroadCast(broadCastPlayload);
}else {
try {
ChatTransmitter.addToQueue(new ChatComponentText("§eDungeons Guide §7:: Message Broadcasted from player:: \n" + new JSONObject(payload).getString("payload")));
diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/stomp/StompClient.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/stomp/StompClient.java
index 3bae2eda..50e63f7f 100644
--- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/stomp/StompClient.java
+++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/stomp/StompClient.java
@@ -64,7 +64,7 @@ public class StompClient extends WebSocketClient {
private static final ScheduledExecutorService ex = Executors.newScheduledThreadPool(1, DungeonsGuide.THREAD_FACTORY);
@Override
- public void onOpen(ServerHandshake handshakedata) {
+ public void onOpen(ServerHandshake handshakeData) {
send(new StompPayload().method(StompHeader.CONNECT)
.header("accept-version","1.2")
.header("heart-beat", "30000,30000")
@@ -152,7 +152,7 @@ public class StompClient extends WebSocketClient {
if (stompClientStatus != StompClientStatus.CONNECTED) throw new IllegalStateException("not connected");
}
- public void sendfake(StompPayload payload) {
+ public void sendFake(StompPayload payload) {
makeSureStompIsConnected();
payload.method(StompHeader.SEND);
if (payload.headers().get("receipt") != null)
diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/stomp/StompManager.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/stomp/StompManager.java
index 1849f312..e1a0baad 100644
--- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/stomp/StompManager.java
+++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/stomp/StompManager.java
@@ -57,7 +57,7 @@ public class StompManager {
public void send(StompPayload payload){
if(stompConnection != null){
- stompConnection.sendfake(payload);
+ stompConnection.sendFake(payload);
} else {
logger.error("OOPS STOMP CONNECTION IS NULL AND SOMEONE TRIED TO SEND SOMETHING THIS SHOULD NOT HAPPEN");
}
diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/stomp/StompPayload.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/stomp/StompPayload.java
index 0e88fffb..17027579 100644
--- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/stomp/StompPayload.java
+++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/stomp/StompPayload.java
@@ -68,7 +68,7 @@ public class StompPayload {
}
public static StompPayload parse(String payload) {
- if (FeatureRegistry.DEBUG.isEnabled()) System.out.println("Receving.. "+payload);
+ if (FeatureRegistry.DEBUG.isEnabled()) System.out.println("Receiving.. "+payload);
Scanner scanner = new Scanner(payload);
StompPayload stompPayload = new StompPayload();
diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/utils/RenderUtils.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/utils/RenderUtils.java
index cd700c51..8e1ed968 100755
--- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/utils/RenderUtils.java
+++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/utils/RenderUtils.java
@@ -301,7 +301,7 @@ public class RenderUtils {
public static void renderBar(float x, float y, float xSize, float completed) {
Minecraft.getMinecraft().getTextureManager().bindTexture(icons);
completed = (float)Math.round(completed / 0.05F) * 0.05F;
- float notcompleted = 1.0F - completed;
+ float notCompleted = 1.0F - completed;
int displayNum = 0;
GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
float width = 0.0F;
@@ -311,7 +311,7 @@ public class RenderUtils {
}
if (completed < 1.0F && (displayNum == 2 || displayNum == 0)) {
- width = Math.min(xSize * notcompleted, xSize / 2.0F);
+ width = Math.min(xSize * notCompleted, xSize / 2.0F);
drawTexturedRect(x + xSize / 2.0F + Math.max(xSize * (completed - 0.5F), 0.0F), y, width, 5.0F, (182.0F - xSize / 2.0F + Math.max(xSize * (completed - 0.5F), 0.0F)) / 256.0F, 0.7109375F, 0.2890625F, 0.30859375F, 9728);
}
diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/utils/TextUtils.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/utils/TextUtils.java
index b2b16725..aa31ac14 100755
--- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/utils/TextUtils.java
+++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/utils/TextUtils.java
@@ -42,11 +42,11 @@ public class TextUtils {
return INTEGER_CHARACTERS.matcher(text).replaceAll("");
}
- public static String join(List list, String delimeter) {
+ public static String join(List list, String delimiter) {
if (list.isEmpty()) return "";
StringBuilder stringBuilder = new StringBuilder();
for (int i = 0; i < list.size() - 1; i++) {
- stringBuilder.append(list.get(i).toString()).append(delimeter);
+ stringBuilder.append(list.get(i).toString()).append(delimiter);
}
stringBuilder.append(list.get(list.size() - 1).toString());
return stringBuilder.toString();
diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/utils/VectorUtils.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/utils/VectorUtils.java
index d3aa4c26..6b707886 100755
--- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/utils/VectorUtils.java
+++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/utils/VectorUtils.java
@@ -25,7 +25,7 @@ import net.minecraft.util.Vec3;
import javax.vecmath.Vector2d;
public class VectorUtils {
- // Ior rooms, different coordinate system is used. Y Increses as marker goes down. X is same.
+ // Ior rooms, different coordinate system is used. Y Increases as marker goes down. X is the same.
public static Vector2d rotateCounterClockwise(Vector2d vector2d) {
diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/utils/cursor/GLCursors.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/utils/cursor/GLCursors.java
index fd7f7cba..fda036f2 100644
--- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/utils/cursor/GLCursors.java
+++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/utils/cursor/GLCursors.java
@@ -101,7 +101,7 @@ public class GLCursors {
break;
}
} catch (Throwable e) {
- if(verbose) logger.error("Error occured while loading cursor: {}", value);
+ if(verbose) logger.error("Error occurred while loading cursor: {}", value);
e.printStackTrace();
}
try {
@@ -110,8 +110,8 @@ public class GLCursors {
BufferedImage bufferedImage = null;
int minC = Cursor.getMinCursorSize(), maxC = Cursor.getMaxCursorSize();
try {
- ResourceLocation cursorinfo = new ResourceLocation("dungeonsguide:cursors/"+value.getAltFileName());
- List<CursorReader.CursorData> cursorDataList = CursorReader.readFromInputStream(Minecraft.getMinecraft().getResourceManager().getResource(cursorinfo).getInputStream());
+ ResourceLocation cursorInfo = new ResourceLocation("dungeonsguide:cursors/"+value.getAltFileName());
+ List<CursorReader.CursorData> cursorDataList = CursorReader.readFromInputStream(Minecraft.getMinecraft().getResourceManager().getResource(cursorInfo).getInputStream());
List<CursorReader.CursorData> cursorDataList2 = cursorDataList.stream()
.filter(cdata -> cdata.getBufferedImage() != null)
.filter(cdata -> minC <= cdata.getHeight() && cdata.getHeight() <= maxC && minC <= cdata.getWidth() && cdata.getWidth() <= maxC)
@@ -124,7 +124,7 @@ public class GLCursors {
hotspotX = cursorData.getXHotSpot();
hotspotY = cursorData.getYHotSpot();
} catch (Throwable t) {
- if(verbose) logger.error("loading currsor failed with message, {}", String.valueOf(Throwables.getRootCause(t)));
+ if(verbose) logger.error("loading cursor failed with message, {}", String.valueOf(Throwables.getRootCause(t)));
}
@@ -149,7 +149,7 @@ public class GLCursors {
c = new Cursor(effWidth, effHeight, hotspotX, height - hotspotY - 1,1,intBuffer, null);
}
} catch (Throwable e) {
- if(verbose) logger.error("Error occured while loading cursor from resource: "+value);
+ if(verbose) logger.error("Error occurred while loading cursor from resource: "+value);
e.printStackTrace();
}
if (c != null) {